From 89943f29476e3de04c638cc7aefbdf2dd24d00c7 Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期四, 17 七月 2025 17:31:18 +0800
Subject: [PATCH] 出库、绑定修改

---
 process/DeviceProcess.cs |   41 ++++++++++++++++++++++++++++++++++-------
 1 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/process/DeviceProcess.cs b/process/DeviceProcess.cs
index 94af32b..f92a1cb 100644
--- a/process/DeviceProcess.cs
+++ b/process/DeviceProcess.cs
@@ -173,6 +173,24 @@
                         //1涓烘帴椹充綅浜や簰
                         if (safety.type == 1)
                         {
+
+                            var wcsTask1 = TaskHelper.GetTaskByWorkNo(mst.S_OP_CODE, "wcs");
+                            if (wcsTask1 != null)
+                            {
+                                //绔嬪簱鍑哄簱浠诲姟瀹屾垚鎵嶈兘涓嬪彂
+                                if (wcsTask1.S_TYPE.Contains("鍑哄簱"))
+                                {
+                                    if (wcsTask1.S_B_STATE != "瀹屾垚")
+                                    {
+                                        return;
+                                    }
+                                }
+                            }
+                            else {
+                                return;
+                            }
+
+                           
                             LogHelper.Info($"鎺ラ┏浣嶅畨鍏ㄤ氦浜掑紑濮�浠诲姟鍙�{mst.S_CODE},鍙栬揣搴撳尯鎺ラ┏浣嶄氦浜� , "瀹夊叏浜や簰");
 
                             //鍏堢粰绔嬪簱鍙戦�鍗歌揣閫氱煡
@@ -231,6 +249,12 @@
 
                 }else
                  {
+                    if (safety.type == 1)
+                    {
+                        LogHelper.Info($"鎺ラ┏浣嶅畨鍏ㄤ氦浜掑紑濮�浠诲姟鍙�{mst.S_CODE},浜や簰绫诲瀷涓�锛屽彇璐у畬鎴�, "瀹夊叏浜や簰");
+                        //鍙栬揣瀹屾垚閫氱煡绔嬪簱
+                        WcsTask.WcsCallback(mst, state, fkNo);
+                    }
                     //1102鍙栬揣瀹屾垚
                     if (safety.type == 2)
                     {
@@ -267,7 +291,7 @@
                         //1涓烘帴椹充綅浜や簰
                         if (safety.type == 1)
                         {
-                            LogHelper.Info($"鎺ラ┏浣嶅畨鍏ㄤ氦浜掑紑濮�浠诲姟鍙�{mst.S_CODE},浜や簰绫诲瀷涓�锛屽嵏璐у簱鍖鸿揣鏋朵氦浜�, "瀹夊叏浜や簰");
+                            LogHelper.Info($"鎺ラ┏浣嶅畨鍏ㄤ氦浜掑紑濮�浠诲姟鍙�{mst.S_CODE},浜や簰绫诲瀷涓�锛屽嵏璐у簱鍖烘帴椹充綅浜や簰", "瀹夊叏浜や簰");
 
                             //鍏堢粰绔嬪簱鍙戦�鍗歌揣閫氱煡
                             WcsTask.WcsCallback(mst, state, fkNo);
@@ -317,15 +341,18 @@
                                 LogHelper.Info($"鑳庨潰瀹夊叏浜や簰鍗歌揣锛屼换鍔″彿={mst.S_CODE},娌℃壘鍒扮粓鐐箋mst.S_END_LOC}閰嶇疆", "鑳庨潰浜や簰");
                             }
                         }
-                    }
-
-
-                    
+                    }                  
                 }
                 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