From eff4c14d88d9240f908dfd7f482f87b2a92f9d0c Mon Sep 17 00:00:00 2001
From: hudong <Administrator@PC-20250329JZUF>
Date: 星期二, 10 六月 2025 17:15:35 +0800
Subject: [PATCH] 1其他出入庫接口代码超时优化 2.领料单接口优化 3.任务状态类型修改 4.空旷出入库逻辑优化

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

diff --git a/core/WCSCore.cs b/core/WCSCore.cs
index ee33e01..f41c066 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);
@@ -61,7 +61,7 @@
                                 //sendsencondtask(TN_Task);
                                 WMSHelper.End(TN_Task);
                                 //鍑哄簱浠诲姟瀹屾垚 淇敼閰嶇洏鍗曠姸鎬佷负瀹屾垚
-                                if (TN_Task.N_TYPE == 2)
+                                if (TN_Task.N_TYPE == 2&&TN_Task.S_TYPE!="鍑哄簱绌烘墭鐩�)
                                 {
                                     WMSHelper.EndTn(TN_Task.S_CNTR_CODE);
                                 }
@@ -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);
                     }
                 }
             }
@@ -100,7 +101,26 @@
                 WMSHelper.UpdateTaskState(optask);
             }
         }
+        //public static bool SendCd()
+        //{
 
+
+
+        //    var result = false;
+
+        //    var dic = new Dictionary<string, string>();
+        //    var dic1 = new Dictionary<string, string>();
+
+        //    dic.Add("ExtDeviceNo", "1");
+
+        //    //鍒ゆ柇
+        //    var res = NDC.OrderAdd(99, dic, dic1);
+        //    if (res != null && (res.Res.ErrCode == 0 || res.Res.ErrCode == 50009))
+        //    {
+        //        result = true;
+        //    }
+        //    return result;
+        //}
         /// <summary>
         /// 浠诲姟鍒嗗彂锛屾牴鎹皟搴︾被鍨嬪彂缁欎笉鍚岀殑璋冨害绯荤粺
         /// </summary>
@@ -133,10 +153,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 +163,6 @@
                     sendsencondtask(wcsTask);
                 }
             }
-        }
+        }   
     }
 }

--
Gitblit v1.9.1