From 3a3c5f5711a57439f34e772313fcbb18ba7885bc Mon Sep 17 00:00:00 2001
From: hudong <Administrator@PC-20250329JZUF>
Date: 星期一, 14 七月 2025 10:31:15 +0800
Subject: [PATCH] 优化

---
 core/WCSCore.cs |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/core/WCSCore.cs b/core/WCSCore.cs
index a2519c7..7b4f945 100644
--- a/core/WCSCore.cs
+++ b/core/WCSCore.cs
@@ -62,15 +62,19 @@
                                 //sendsencondtask(TN_Task);
                                 WMSHelper.End(TN_Task);
                                 //鍑哄簱浠诲姟瀹屾垚 淇敼閰嶇洏鍗曠姸鎬佷负瀹屾垚
-                                if (TN_Task.N_TYPE == 2&&TN_Task.S_TYPE!="鍑哄簱绌烘墭鐩�)
+                                if (TN_Task.N_TYPE == 2&&TN_Task.S_TYPE!="鍑哄簱绌烘墭鐩� && TN_Task.S_TYPE != "鍗婃墭鍑哄簱")
                                 {
                                     WMSHelper.EndTn(TN_Task.S_CNTR_CODE);
                                 }
                                 break;
                             case 7:
-                                TaskProcess.OperateStatus(TN_Task, 7);
-                                WCSHelper.Fail(TN_Task);
-                                WMSHelper.Fail(TN_Task);
+                                if (TN_Task.N_B_STATE!=3)
+                                {
+                                    TaskProcess.OperateStatus(TN_Task, 7);
+                                    WCSHelper.Fail(TN_Task);
+                                    WMSHelper.Fail(TN_Task);
+                                }
+                                
                                 //sendsencondtask(TN_Task);
                                 //WMSHelper.End(TN_Task);
                                 break;

--
Gitblit v1.9.1