From e089d7eb80bf4d6f8442500b691924ccc83a1a49 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期四, 26 九月 2024 11:05:40 +0800
Subject: [PATCH] 修改演示模式开关功能
---
Admin.NET/WCS.Application/Hub/PlcHub.cs | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/Admin.NET/WCS.Application/Hub/PlcHub.cs b/Admin.NET/WCS.Application/Hub/PlcHub.cs
index bfb6fb8..32b4253 100644
--- a/Admin.NET/WCS.Application/Hub/PlcHub.cs
+++ b/Admin.NET/WCS.Application/Hub/PlcHub.cs
@@ -74,12 +74,23 @@
if (PLCTaskAction.boDemo)
{
//鍒ゆ柇鍒嗘嫞鐮佸灈鏈夋病鏈夌粦瀹氫换鍔�
- var checkTask = await _wcsCheckTaskRep.Context.Queryable<WcsCheckTask>().Where(w => w.Status == "1").ToListAsync();
+ var checkTask = await _wcsCheckTaskRep.Context.Queryable<WcsCheckTask>().Where(w => w.Status == "1" && w.RoboatType == PLCTypeEnum.RobotPalletizer).ToListAsync();
if (checkTask.Count > 0)
{
- throw Oops.Oh("鍒嗘嫞鐮佸灈宸茬粦瀹氫换鍔★紝涓嶆敮鎸佸紑鍚紨绀烘ā寮忥紒");
+ PLCTaskAction.boDemo = false;
+ await _plcHubContext.Clients.All.UpdateService(
+ new PLCServiceModel()
+ {
+ BoRunningState = PLCTaskAction.boRunningState,
+ BoRefresh = PLCTaskAction.boRefresh,
+ BoOffline = PLCTaskAction.boOffline,
+ BoDemo = PLCTaskAction.boDemo,
+ BoDrumReversal = PLCTaskAction.boDrumReversal,
+ Error = "鍒嗘嫞鐮佸灈宸茬粦瀹氫换鍔★紝涓嶆敮鎸佸紑鍚紨绀烘ā寮忥紒"
+ });
+ return;
}
- }
+ }
//PLC杩炴帴
var plcStackeConn = PLCTaskAction.listPlcConn.First(m => m.PlcIP == "10.18.51.120");
if (plcStackeConn.Connected)
@@ -93,11 +104,35 @@
else
{
PLCTaskAction.boDemo = !PLCTaskAction.boDemo;
+
+ await _plcHubContext.Clients.All.UpdateService(
+ new PLCServiceModel()
+ {
+ BoRunningState = PLCTaskAction.boRunningState,
+ BoRefresh = PLCTaskAction.boRefresh,
+ BoOffline = PLCTaskAction.boOffline,
+ BoDemo = PLCTaskAction.boDemo,
+ BoDrumReversal = PLCTaskAction.boDrumReversal,
+ Error = "涓嶱CL浜や簰澶辫触锛屾搷浣滃け璐ワ紒"
+ });
+ return;
}
}
else
{
PLCTaskAction.boDemo = !PLCTaskAction.boDemo;
+
+ await _plcHubContext.Clients.All.UpdateService(
+ new PLCServiceModel()
+ {
+ BoRunningState = PLCTaskAction.boRunningState,
+ BoRefresh = PLCTaskAction.boRefresh,
+ BoOffline = PLCTaskAction.boOffline,
+ BoDemo = PLCTaskAction.boDemo,
+ BoDrumReversal = PLCTaskAction.boDrumReversal,
+ Error = "PCL鏈繛鎺ワ紝鎿嶄綔澶辫触锛�"
+ });
+ return;
}
}
//婊氱瓛鍙嶈浆
@@ -120,7 +155,7 @@
PLCTaskAction.boDrumReversal = !PLCTaskAction.boDrumReversal;
}
}
- else
+ else
{
PLCTaskAction.boDrumReversal = !PLCTaskAction.boDrumReversal;
}
@@ -141,4 +176,8 @@
public bool? BoDemo { get; set; }
public bool? BoDrumReversal { get; set; }
+ /// <summary>
+ /// 閿欒淇℃伅
+ /// </summary>
+ public string Error { get; set; }
}
\ No newline at end of file
--
Gitblit v1.8.0