From fc25dda9baf3b5f4df23d35914f3dd343cf492e3 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期一, 28 七月 2025 17:30:21 +0800
Subject: [PATCH] 优化WCSHelper / 序列号生成逻辑 , 添加强制任务处理模块

---
 process/TaskProcess.cs |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/process/TaskProcess.cs b/process/TaskProcess.cs
index 314d728..35d6e15 100644
--- a/process/TaskProcess.cs
+++ b/process/TaskProcess.cs
@@ -283,12 +283,12 @@
             var taskType = mst.S_TYPE.Trim();
 
             if (mst.N_B_STATE == 0) {
-                start = LocationHelper.GetAgvSite(mst.S_START_LOC);
-                end = LocationHelper.GetAgvSite(mst.S_END_LOC);
+                start = WCSHelper.GetAgvSite(mst.S_START_LOC);
+                end = WCSHelper.GetAgvSite(mst.S_END_LOC);
                 LogHelper.Info($"NDC鎺ㄩ�浠诲姟:{mst.S_CODE};start='{start}',end='{end}'");
 
-                var startLoc = LocationHelper.GetLoc(mst.S_START_LOC);
-                var endLoc = LocationHelper.GetLoc(mst.S_END_LOC);
+                var startLoc = WCSHelper.GetLocation(mst.S_START_LOC);
+                var endLoc = WCSHelper.GetLocation(mst.S_END_LOC);
                 var dic = new List<param>();
                 dic.Add(new param() { name = "IKey", value = "IKey" });
                 dic.Add(new param() { name = "From", value = start.ToString() });
@@ -301,7 +301,7 @@
                     //鎺ㄩ�鎴愬姛,淇敼浠诲姟浼樺厛绾�                     mst.N_B_STATE = 1;
                     mst.S_B_STATE = TN_Task.GetStateStr(1);
-                    WCSHelper.UpdateStatus(mst);//鏇存柊浠诲姟鐘舵�
+                    WCSHelper.UpdateTaskState(mst);//鏇存柊浠诲姟鐘舵�
                     result = true;
                     LogHelper.Info($"NDC鎺ㄩ�浠诲姟鎴愬姛:{mst.S_CODE};start='{mst.S_START_LOC}',end='{mst.S_END_LOC}'");
                 }
@@ -320,8 +320,8 @@
 
             if (mst.N_B_STATE == 0) {
                 //var code = GZRobot.CreateOrder(mst.S_CODE, mst.N_PRIORITY, JsonConvert.SerializeObject(new { src = mst.S_START_LOC, dst = mst.S_END_LOC }), "p2p");
-                start = LocationHelper.GetAgvSite(mst.S_START_LOC);
-                end = LocationHelper.GetAgvSite(mst.S_END_LOC);
+                start = WCSHelper.GetAgvSite(mst.S_START_LOC);
+                end = WCSHelper.GetAgvSite(mst.S_END_LOC);
 
                 var code = GZRobot.CreateOrder(mst.S_CODE, mst.N_PRIORITY, JsonConvert.SerializeObject(new { src = start, dst = end }), "p2pdst", "pgapi");
 
@@ -330,8 +330,8 @@
                     mst.N_B_STATE = 1;
                     mst.S_B_STATE = TN_Task.GetStateStr(1);
                     mst.S_EQ_TASK_CODE = code.ToString();
-                    WCSHelper.UpdateStatus(mst);
-                    WCSHelper.UpdateEQNo(mst);
+                    WCSHelper.UpdateTaskState(mst);
+                    WCSHelper.UpdateEqTaskNo(mst);
                     LogHelper.Info($"鍥借嚜鎺ㄩ�浠诲姟鎴愬姛 {mst.S_CODE};" + "start=" + mst.S_START_LOC + "end= " + mst.S_END_LOC);
                 }
                 else {
@@ -353,7 +353,7 @@
             };
             if (HanAo.CreateOrder(model)) {
                 mst.N_B_STATE = 1;
-                WCSHelper.UpdateStatus(mst);
+                WCSHelper.UpdateTaskState(mst);
                 LogHelper.Info($"鏉ゥ鎺ㄩ�浠诲姟鎴愬姛 {mst.S_CODE};" + "start=" + model.frmPos + "end= " + model.toPos);
                 return true;
             }

--
Gitblit v1.9.1