From 3a56820d028e98ac3c4bd315aa76181d7d6720cd Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期一, 28 七月 2025 17:29:57 +0800
Subject: [PATCH] 金坛二合一出库修改

---
 dispatch/WcsTask.cs |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dispatch/WcsTask.cs b/dispatch/WcsTask.cs
index 9528c7f..2e50bb6 100644
--- a/dispatch/WcsTask.cs
+++ b/dispatch/WcsTask.cs
@@ -641,9 +641,7 @@
                      //浠诲姟瀹屾垚
                     case "2":
                         LogHelper.Info($"浠诲姟{taskNo}瀹屾垚", "Wcs浠诲姟鎵ц閫氱煡");
-                        LocationHelper.UnLockLoc(transportTask.S_START_LOC);
                         TaskProcess.OperateStatus(transportTask, 4);
-                        LocationHelper.UnLockLoc(transportTask.S_END_LOC);
                         TaskProcess.OperateStatus(transportTask, 6);
                         TaskHelper.End(transportTask);
                         LocationHelper.CreateUpAndDown(transportTask);
@@ -878,6 +876,8 @@
                             {
                                 TaskHelper.Fail(agvTask1);
                                 NDCApi.CancelOrder(agvTask1.S_CODE.Trim());
+                              
+                                LogHelper.Info($"Wcs浠诲姟鎵ц閫氱煡锛屼换鍔″彿{transportTask.S_CODE}鍙栨秷,瑙i攣", "瑙i攣");
                                 TaskProcess.CacheBitCancelUpdate(agvTask1);
                             }
                         }
@@ -1350,6 +1350,7 @@
                     {
                         LogHelper.Info($"浠诲姟鍙穥task.S_CODE},鍙栨秷浠诲姟鎴愬姛锛岃捣鐐箋task.S_START_LOC}璁句负寮傚父", "鍙栬揣鏃犺揣");
                         TaskHelper.Fail(task);
+
                         TaskProcess.OperateStatus(task, 7);
                         LocationHelper.updateLocLock(task.S_START_LOC, 3, "鍏朵粬閿�);
                         var agvTask = TaskHelper.GetTaskByWorkNo(task.S_OP_CODE, "agv");
@@ -1360,6 +1361,8 @@
                                 NDCApi.CancelOrder(agvTask.S_CODE.Trim());
                             }
                             TaskHelper.Fail(agvTask);
+
+                            LogHelper.Info($"鍙栬揣鏃犺揣锛屼换鍔″彿{task.S_CODE}鍙栨秷,瑙i攣", "瑙i攣");
                             TaskProcess.CacheBitCancelUpdate(agvTask);
                         }
                     }

--
Gitblit v1.9.1