From 17c1c9bb4537f3915e5b53e1a26a1a0b9c8e7c85 Mon Sep 17 00:00:00 2001
From: hudong <Administrator@PC-20250329JZUF>
Date: 星期一, 16 六月 2025 08:37:58 +0800
Subject: [PATCH] 1.定时充电问题排查,增加状态字段增加定时更新状态2.删除webservice所有日志 api接口日志(超时问题优化)

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

diff --git a/core/WCSCore.cs b/core/WCSCore.cs
index e68eba8..c60542f 100644
--- a/core/WCSCore.cs
+++ b/core/WCSCore.cs
@@ -7,6 +7,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using static HH.WCS.Mobox3.pinggao.api.ApiModel;
 
 namespace HH.WCS.Mobox3.pinggao.core {
@@ -61,7 +62,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 +70,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 +85,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 +102,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>
@@ -120,6 +141,10 @@
 
 
             }
+        } internal static void Dispatch1() {
+            //鏌ヨ浠诲姟
+            //鑾峰彇鎵�湁绛夊緟鐨勪换鍔�+            TaskProcess.SendCd();
         }
 
         /// <summary>
@@ -133,10 +158,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 +168,6 @@
                     sendsencondtask(wcsTask);
                 }
             }
-        }
+        }   
     }
 }

--
Gitblit v1.9.1