From 8b0d749cfbec8bf0afe71a8956bfeeed6f27cdfc Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期四, 16 一月 2025 15:32:30 +0800
Subject: [PATCH] Merge branch 'csc'

---
 Admin.NET/WCS.Application/Hub/PlcHub.cs |   71 +++++++++++++++++++++++++++++++++--
 1 files changed, 67 insertions(+), 4 deletions(-)

diff --git a/Admin.NET/WCS.Application/Hub/PlcHub.cs b/Admin.NET/WCS.Application/Hub/PlcHub.cs
index 32b4253..a7caaa5 100644
--- a/Admin.NET/WCS.Application/Hub/PlcHub.cs
+++ b/Admin.NET/WCS.Application/Hub/PlcHub.cs
@@ -99,7 +99,23 @@
                 var ret = plcStackeConn.SetPlcDBValue(PLCDataTypeEnum.Bit, "DB119", "0", PLCTaskAction.boDemo == true ? "1" : "0");
                 if (ret.IsSucceed)
                 {
-                    await _sysConfigService.UpdateConfigValue("sys_demo", context.BoDemo.Value);
+                    if (PLCTaskAction.boDemo)
+                    {
+                        // 鍐欏叆plc鎶撶鍝佺
+                        var rett = plcStackeConn.SetPlcDBValue(PLCDataTypeEnum.Short, "DB111", "0", "1");
+                        if (rett.IsSucceed)
+                        {
+                            await _sysConfigService.UpdateConfigValue("sys_demo", context.BoDemo.Value);
+                        }
+                    }
+                    else 
+                    {
+                        var rett = plcStackeConn.SetPlcDBValue(PLCDataTypeEnum.Short, "DB111", "0", "0");
+                        if (rett.IsSucceed)
+                        {
+                            await _sysConfigService.UpdateConfigValue("sys_demo", context.BoDemo.Value);
+                        }
+                    }                 
                 }
                 else
                 {
@@ -113,6 +129,8 @@
                            BoOffline = PLCTaskAction.boOffline,
                            BoDemo = PLCTaskAction.boDemo,
                            BoDrumReversal = PLCTaskAction.boDrumReversal,
+                           BoOutLock=PLCTaskAction.boOutLock,
+                           BoEnterLock=PLCTaskAction.boEnterLock,
                            Error = "涓嶱CL浜や簰澶辫触锛屾搷浣滃け璐ワ紒"
                        });
                     return;
@@ -130,6 +148,8 @@
                        BoOffline = PLCTaskAction.boOffline,
                        BoDemo = PLCTaskAction.boDemo,
                        BoDrumReversal = PLCTaskAction.boDrumReversal,
+                       BoOutLock = PLCTaskAction.boOutLock,
+                       BoEnterLock = PLCTaskAction.boEnterLock,
                        Error = "PCL鏈繛鎺ワ紝鎿嶄綔澶辫触锛�"
                    });
                 return;
@@ -153,29 +173,72 @@
                 else
                 {
                     PLCTaskAction.boDrumReversal = !PLCTaskAction.boDrumReversal;
+
+                    await _plcHubContext.Clients.All.UpdateService(
+                       new PLCServiceModel()
+                       {
+                           BoRunningState = PLCTaskAction.boRunningState,
+                           BoRefresh = PLCTaskAction.boRefresh,
+                           BoOffline = PLCTaskAction.boOffline,
+                           BoDemo = PLCTaskAction.boDemo,
+                           BoDrumReversal = PLCTaskAction.boDrumReversal,
+                           BoOutLock=PLCTaskAction.boOutLock,
+                           BoEnterLock=PLCTaskAction.boEnterLock,
+                           Error = "涓嶱CL浜や簰澶辫触锛屾搷浣滃け璐ワ紒"
+                       });
+                    return;
                 }
             }
             else
             {
                 PLCTaskAction.boDrumReversal = !PLCTaskAction.boDrumReversal;
+
+                await _plcHubContext.Clients.All.UpdateService(
+                   new PLCServiceModel()
+                   {
+                       BoRunningState = PLCTaskAction.boRunningState,
+                       BoRefresh = PLCTaskAction.boRefresh,
+                       BoOffline = PLCTaskAction.boOffline,
+                       BoDemo = PLCTaskAction.boDemo,
+                       BoDrumReversal = PLCTaskAction.boDrumReversal,
+                       BoOutLock = PLCTaskAction.boOutLock,
+                       BoEnterLock = PLCTaskAction.boEnterLock,
+                       Error = "PCL鏈繛鎺ワ紝鎿嶄綔澶辫触锛�"
+                   });
+                return;
             }
         }
-        await _plcHubContext.Clients.All.UpdateService(new PLCServiceModel() { BoRunningState = PLCTaskAction.boRunningState, BoRefresh = PLCTaskAction.boRefresh, BoOffline = PLCTaskAction.boOffline, BoDemo = PLCTaskAction.boDemo, BoDrumReversal = PLCTaskAction.boDrumReversal });
+        //鍑哄簱閿佸畾
+        if (context.BoOutLock.HasValue)
+        {
+            PLCTaskAction.boOutLock = context.BoOutLock.Value;
+            await _sysConfigService.UpdateConfigValue("sys_BoOutLock", context.BoOutLock.Value);
+        }
+        //鍏ュ簱閿佸畾
+        if (context.BoEnterLock.HasValue)
+        {
+            PLCTaskAction.boEnterLock = context.BoEnterLock.Value;
+            await _sysConfigService.UpdateConfigValue("sys_BoEnterLock", context.BoEnterLock.Value);
+        }
+        await _plcHubContext.Clients.All.UpdateService(new PLCServiceModel() { BoRunningState = PLCTaskAction.boRunningState, BoRefresh = PLCTaskAction.boRefresh, BoOffline = PLCTaskAction.boOffline, BoDemo = PLCTaskAction.boDemo, BoDrumReversal = PLCTaskAction.boDrumReversal, BoOutLock = PLCTaskAction.boOutLock, BoEnterLock = PLCTaskAction.boEnterLock });
     }
 }
 public class PLCServiceModel
 {
     public bool? BoRunningState { get; set; }
 
-
     public bool? BoOffline { get; set; }
-
 
     public bool? BoRefresh { get; set; }
 
     public bool? BoDemo { get; set; }
 
     public bool? BoDrumReversal { get; set; }
+
+    public bool? BoOutLock { get; set; }
+
+    public bool? BoEnterLock { get; set; }
+
     /// <summary>
     /// 閿欒淇℃伅
     /// </summary>

--
Gitblit v1.8.0