From fb5c3be6709ba89053dc75c9fabfb94cb89c6be1 Mon Sep 17 00:00:00 2001
From: hudong <Administrator@PC-20250329JZUF>
Date: 星期三, 18 六月 2025 16:14:18 +0800
Subject: [PATCH] 修改重点逻辑修改 定时充电优化

---
 core/WCSCore.cs |   33 ++++++++++++++++++++++++++++++++-
 1 files changed, 32 insertions(+), 1 deletions(-)

diff --git a/core/WCSCore.cs b/core/WCSCore.cs
index 4bcd182..a2519c7 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);
                                 }
@@ -101,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>
@@ -121,6 +141,17 @@
 
 
             }
+        } 
+        internal static void Dispatch1() {
+            //鏌ヨ浠诲姟
+            //鑾峰彇鎵�湁绛夊緟鐨勪换鍔�+            TaskProcess.SendCd();
+        }
+        internal static void DSCZ()
+        {
+            //鏌ヨ浠诲姟
+            //鑾峰彇鎵�湁绛夊緟鐨勪换鍔�+            TaskProcess.SendCZ();
         }
 
         /// <summary>

--
Gitblit v1.9.1