From 9b85a8b67aa6354ee9ea1a13c5799bf1c934922f Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期四, 31 十月 2024 18:12:14 +0800
Subject: [PATCH] 修改问题
---
Admin.NET/WCS.Application/Hub/PlcHub.cs | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 50 insertions(+), 3 deletions(-)
diff --git a/Admin.NET/WCS.Application/Hub/PlcHub.cs b/Admin.NET/WCS.Application/Hub/PlcHub.cs
index 282d65e..a7caaa5 100644
--- a/Admin.NET/WCS.Application/Hub/PlcHub.cs
+++ b/Admin.NET/WCS.Application/Hub/PlcHub.cs
@@ -129,6 +129,8 @@
BoOffline = PLCTaskAction.boOffline,
BoDemo = PLCTaskAction.boDemo,
BoDrumReversal = PLCTaskAction.boDrumReversal,
+ BoOutLock=PLCTaskAction.boOutLock,
+ BoEnterLock=PLCTaskAction.boEnterLock,
Error = "涓嶱CL浜や簰澶辫触锛屾搷浣滃け璐ワ紒"
});
return;
@@ -146,6 +148,8 @@
BoOffline = PLCTaskAction.boOffline,
BoDemo = PLCTaskAction.boDemo,
BoDrumReversal = PLCTaskAction.boDrumReversal,
+ BoOutLock = PLCTaskAction.boOutLock,
+ BoEnterLock = PLCTaskAction.boEnterLock,
Error = "PCL鏈繛鎺ワ紝鎿嶄綔澶辫触锛�"
});
return;
@@ -169,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