From 8b05ae0960f7f6de3fbc99e4af9ba03ff75ec6e1 Mon Sep 17 00:00:00 2001
From: hudong <Administrator@PC-20250329JZUF>
Date: 星期一, 26 五月 2025 08:49:29 +0800
Subject: [PATCH] 与现场实施测试出入库流程 入库任务下发参数修改测试 称重高度会议讨论重新计算货位 变更终点下发联调

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

diff --git a/core/WCSCore.cs b/core/WCSCore.cs
index ee33e01..4bcd182 100644
--- a/core/WCSCore.cs
+++ b/core/WCSCore.cs
@@ -32,10 +32,10 @@
                             case 4:
                                 WCSHelper.UpdateStatus(TN_Task, "鍙栬揣瀹屾垚");
                                 TaskProcess.OperateStatus(TN_Task, 4);
-                                if (TN_Task.N_TYPE == 2)
-                                {
-                                    WMSHelper.DeleteChange(TN_Task);
-                                }
+                                //if (TN_Task.N_TYPE == 2)
+                                //{
+                                //    WMSHelper.DeleteChange(TN_Task);
+                                //}
                                 break;
                             case 5:
                                 WCSHelper.UpdateStatus(TN_Task, "寮�鍗歌揣");
@@ -43,7 +43,7 @@
                             case 6:
                                 WCSHelper.UpdateStatus(TN_Task, "鍗歌揣瀹屾垚");
                                 TaskProcess.OperateStatus(TN_Task, 6);
-                                if (TN_Task.N_TYPE == 1)
+                                if (TN_Task.N_TYPE == 1&&TN_Task.S_TYPE!= "鍥炲簱")
                                 {
                                     WMSHelper.AddChange(TN_Task);
                                     WMSHelper.QsDeleteChange(TN_Task);
@@ -69,6 +69,7 @@
                             case 7:
                                 TaskProcess.OperateStatus(TN_Task, 7);
                                 WCSHelper.Fail(TN_Task);
+                                WMSHelper.Fail(TN_Task);
                                 //sendsencondtask(TN_Task);
                                 //WMSHelper.End(TN_Task);
                                 break;
@@ -83,7 +84,7 @@
                     }
                     else {
                         //瀹夊叏璇锋眰绛�-                        TaskProcess.OperateReq( TN_Task, model.State, model.ForkliftNo, model.ExtData, model.Ext1);
+                        TaskProcess.OperateReq( TN_Task, model.State, model.ForkliftNo, model.ExtData);
                     }
                 }
             }
@@ -133,10 +134,6 @@
                 var end = LocationHelper.GetLoc(wcsTask.S_END_LOC);
                 if (model.code == "0") {
                     
-                    //鍏ュ簱
-                  
-                    //鏍囪浠诲姟瀹屾垚
-                    //鏍囪浣滀笟瀹屾垚
                     wcsTask.N_B_STATE = 3;
                     WCSHelper.UpdateStatus(wcsTask,"瀹屾垚");
                     var wmsTask = WMSHelper.GetWmsTask(wcsTask.S_OP_CODE);
@@ -147,6 +144,6 @@
                     sendsencondtask(wcsTask);
                 }
             }
-        }
+        }   
     }
 }

--
Gitblit v1.9.1