From 04eed9fb0fdb0a4c09c482f78d4449f941cfaadb Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期三, 14 五月 2025 17:24:06 +0800
Subject: [PATCH] 金坛bug修改

---
 process/TaskProcess.cs |   40 ++++++++++++++++++++++++++++++----------
 1 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/process/TaskProcess.cs b/process/TaskProcess.cs
index 72934f9..34cc6df 100644
--- a/process/TaskProcess.cs
+++ b/process/TaskProcess.cs
@@ -124,10 +124,10 @@
                     return;
                 }
 
-                var wcsTask = TaskHelper.GetTask(mst.S_OP_CODE + "_2");
+                var wcsTask = TaskHelper.GetTaskByWorkNo(mst.S_OP_CODE,"wcs");
                 if (wcsTask == null)
                 {
-                    LogHelper.Info($"鍒ゆ柇宸烽亾鍙敤澶辫触锛屾病鎵惧埌瀵瑰簲{mst.S_OP_CODE + "_2"}浠诲姟", "鏀归亾瀹夊叏浜や簰");
+                    LogHelper.Info($"鍒ゆ柇宸烽亾鍙敤澶辫触锛屾病鎵惧埌瀵瑰簲{mst.S_OP_CODE}鐨剋cs浠诲姟", "鏀归亾瀹夊叏浜や簰");
                     return;
                 }
                 //鍒ゆ柇绌烘墭缂撳瓨銆佹帴椹充綅鍜屽贩閬撴槸鍚﹀彲鐢�涓嶅彲鐢ㄩ渶瑕佹敼閬�@@ -138,7 +138,7 @@
                 //寮�叧鍏抽棬鐢宠
                 DeviceProcess.Door(mst, forkliftNo, state);
             }
-            else if (state == 1013) {
+            else if (state == 1002) {
                 LogHelper.Info($"绛夊緟浜や簰锛屼换鍔″彿={mst.S_CODE}锛屽嵏璐т氦绠℃垚鍔燂紝淇敼鍙傛暟", "瀹夊叏浜や簰");
 
                 //绛夊緟rfid鏍¢獙
@@ -791,8 +791,8 @@
 
             try
             {
-                var task = TaskHelper.GetTask(model.task_no + "_1");
-                var wcsTask = TaskHelper.GetTask(model.task_no + "_2");
+                var task = TaskHelper.GetTaskByWorkNo(model.task_no, "agv");
+                var wcsTask = TaskHelper.GetTaskByWorkNo(model.task_no,"wcs");
                 if (task != null && wcsTask != null)
                 {
                     if (task.S_B_STATE.Trim() == "鏈墽琛�)
@@ -856,7 +856,7 @@
                 else
                 {
                     result.errCode = 1;
-                    result.errMsg = "浠诲姟涓嶅瓨鍦�;
+                    result.errMsg = $"{model.task_no}浠诲姟涓嶅瓨鍦�;
                     result.success = false;
                 }
             }
@@ -1280,6 +1280,9 @@
                     //鎺ラ┏浣�                     var connection = "";
 
+                    //鎺ラ┏浣嶅簱鍖哄悕绉�+                    var connectionArea = "";
+
                     //濡傛灉闇�涓嬪彂wcs绔嬪簱锛屽垯闇�瀵绘壘鍙敤鎺ラ┏浣�                     if (workFlow.SENDWCS == "Y") {
 
@@ -1311,6 +1314,7 @@
                                 if (con.N_CURRENT_NUM < 2 && con.C_ENABLE == "Y")
                                 {
                                     connection = con.S_CODE;
+                                    connectionArea = con.S_AREA_Name;
                                     LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂瀵绘壘鍒板彲鐢ㄦ帴椹充綅{connection}", "Mes浠诲姟涓嬪彂");
                                 }
                             }
@@ -1482,8 +1486,13 @@
                         //浼樺厛绾�                         N_PRIORITY = model.Priority,
                         //宸ヨ绫诲瀷
-                        TOOLSTYPE = TOOLSTYPE
-
+                        TOOLSTYPE = TOOLSTYPE,
+                        //璧风偣搴撳尯鍚嶇О
+                        S_START_AREA_NAME = start.S_AREA_Name,
+                        //璧风偣搴撳尯鍚嶇О
+                        S_END_AREA_NAME = end.S_AREA_Name,
+                        //璧风偣搴撳尯鍚嶇О
+                        CONNECTION_AREA = connectionArea,
                     };
 
                     //鍒涘缓浣滀笟
@@ -1508,6 +1517,10 @@
 
                     //鎺ラ┏浣�                     var connection = "";
+
+                    //鎺ラ┏浣嶅簱鍖�+                    var connectionArea = "";
+                    
 
                     //鏌ユ壘缁欏畾缁堢偣
                     var end = LocationHelper.GetLoc(model.Location_To);
@@ -1619,9 +1632,10 @@
                             foreach (var item in usableConnectionList.available)
                             {
                                 var con = LocationHelper.GetLoc(item);
-                                if (con.S_LOCK_STATE == "鏃� && con.N_CURRENT_NUM < 2)
+                                if (con.C_ENABLE == "Y" && con.N_CURRENT_NUM < 2)
                                 {
                                     connection = con.S_CODE;
+                                    connectionArea = con.S_AREA_Name;
                                     LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟涓嬪彂瀵绘壘鍒板彲鐢ㄦ帴椹充綅{connection}", "Mes浠诲姟涓嬪彂");
                                 }
                             }
@@ -1669,7 +1683,13 @@
                         //浼樺厛绾�                         N_PRIORITY = model.Priority,
                         //宸ヨ绫诲瀷
-                        TOOLSTYPE = TOOLSTYPE
+                        TOOLSTYPE = TOOLSTYPE,
+                        //璧风偣搴撳尯鍚嶇О
+                        S_START_AREA_NAME = start.S_AREA_Name,
+                        //璧风偣搴撳尯鍚嶇О
+                        S_END_AREA_NAME = end.S_AREA_Name,
+                        //璧风偣搴撳尯鍚嶇О
+                        CONNECTION_AREA = connectionArea
                     };
 
                     //鍒涘缓浣滀笟

--
Gitblit v1.9.1