From 987b9256e007825401cef4fe18f250566eedf3d5 Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期五, 06 六月 2025 17:28:15 +0800
Subject: [PATCH] 改道优化
---
process/DeviceProcess.cs | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/process/DeviceProcess.cs b/process/DeviceProcess.cs
index 94af32b..9be624d 100644
--- a/process/DeviceProcess.cs
+++ b/process/DeviceProcess.cs
@@ -231,6 +231,12 @@
}else
{
+ if (safety.type == 1)
+ {
+ LogHelper.Info($"鎺ラ┏浣嶅畨鍏ㄤ氦浜掑紑濮�浠诲姟鍙�{mst.S_CODE},浜や簰绫诲瀷涓�锛屽彇璐у畬鎴�, "瀹夊叏浜や簰");
+ //鍙栬揣瀹屾垚閫氱煡绔嬪簱
+ WcsTask.WcsCallback(mst, state, fkNo);
+ }
//1102鍙栬揣瀹屾垚
if (safety.type == 2)
{
@@ -324,8 +330,14 @@
}
else
{
- //1104鍗歌揣瀹屾垚
- if (safety.type == 2)
+ if (safety.type == 1)
+ {
+ LogHelper.Info($"鎺ラ┏浣嶅畨鍏ㄤ氦浜掑紑濮�浠诲姟鍙�{mst.S_CODE},浜や簰绫诲瀷涓�锛屽嵏璐у畬鎴�, "瀹夊叏浜や簰");
+ //鍗歌揣瀹屾垚閫氱煡绔嬪簱
+ WcsTask.WcsCallback(mst, state, fkNo);
+ }
+ //1104鍗歌揣瀹屾垚
+ if (safety.type == 2)
{
var safetyLoc = Settings.TmDeviceInfos.Where(a => a.locCode.Contains(mst.S_END_LOC) && a.deviceType == 2).FirstOrDefault();
if (safetyLoc != null)
--
Gitblit v1.9.1