From fad1333a599e562c8fa7ee350852fee72b9a6a28 Mon Sep 17 00:00:00 2001
From: 杨张扬 <634643841@qq.com>
Date: 星期三, 02 七月 2025 17:33:25 +0800
Subject: [PATCH] 出库任务取消在4之前不删除库存

---
 core/WCSCore.cs |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/core/WCSCore.cs b/core/WCSCore.cs
index 3c45359..8403b7c 100644
--- a/core/WCSCore.cs
+++ b/core/WCSCore.cs
@@ -162,9 +162,23 @@
                                 case 7:
                                     Task task10 = Task.Run(() =>
                                     {
-                                        if (TN_Task.S_TYPE.Contains("婊℃墭涓嬬嚎鍏ュ簱") || TN_Task.S_TYPE.Contains("PDA婊℃墭涓嬬嚎鍏ュ簱"))
+                                        if (TN_Task.S_END_AREA == Settings.Areas[1])//缁堢偣鏄弧鎵樼紦瀛樺簱鍖�                                         {
                                             TaskProcess.OperateStatus(TN_Task, 7);//寮傚父澶勭悊
+                                        }
+                                        else if(TN_Task.S_START_AREA == Settings.Areas[1])//璧风偣鏄弧鎵樼紦瀛樺簱鍖�+                                        {
+                                            if (!WCSHelper.CheckActionRecordExist(TN_Task.S_CODE, 4))//鏈彇璐у畬鎴�+                                            {
+                                                WCSHelper.Fail(TN_Task);//浠诲姟鐘舵�鏀规垚閿欒
+                                            }
+                                            else
+                                            {
+                                                WCSHelper.End(TN_Task);//浠诲姟鐘舵�鏀规垚缁撴潫
+                                                LocationHelper.BindingLoc(TN_Task.S_END_LOC, TN_Task.S_CNTR_CODE.Split(',').ToList());// 缁戝畾缁堢偣瀹瑰櫒璐т綅
+                                            }
+                                            LocationHelper.UnLockLoc(TN_Task.S_END_LOC);
+                                            LocationHelper.UnLockLoc(TN_Task.S_START_LOC);//瑙i攣璧风偣缁堢偣
                                         }
                                         else
                                         {
@@ -192,7 +206,6 @@
                                             LocationHelper.UnLockLoc(TN_Task.S_END_LOC);
                                             LocationHelper.UnLockLoc(TN_Task.S_START_LOC);//瑙i攣璧风偣缁堢偣
                                         }
-                                        
                                     });
                                     break;
 

--
Gitblit v1.9.1