From b346c6a0631d992e66823d9364ef47429715c546 Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期一, 16 六月 2025 17:34:49 +0800
Subject: [PATCH] 1

---
 core/TaskCore.cs |   53 ++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/core/TaskCore.cs b/core/TaskCore.cs
index ed22626..3fa9e5d 100644
--- a/core/TaskCore.cs
+++ b/core/TaskCore.cs
@@ -11,6 +11,7 @@
 using System.Reflection;
 using System.Threading.Tasks;
 using System.Web.Services.Description;
+using Top.Api;
 using static HH.WCS.ZhongCeJinTan.api.ApiModel;
 using static HH.WCS.ZhongCeJinTan.util.Settings;
 
@@ -19,7 +20,6 @@
     internal class TaskCore
     {
         public static void OperateTaskStatus(AgvTaskState model) {
-
             var wmsTask = TaskHelper.GetTask(model.task_no);
             var db = new SqlHelper<object>().GetInstance();
 
@@ -33,7 +33,7 @@
                         switch (model.state)
                         {
                             case 1:
-                                TaskHelper.Begin(wmsTask);
+                                TaskHelper.Begin(wmsTask,model.forklift_no);
                                 //鑳庨潰浜や簰
                                 TaskHelper.TmSafety(wmsTask);
                                 break;
@@ -62,9 +62,26 @@
                                 }                        
                             break;
                             case 2:
-                                TaskHelper.End(wmsTask); 
+                            //绌烘墭鍑烘垨鑰呮弧鎵樺嚭浠诲姟瀹屾垚鍒ゆ柇鏄惁瑕佹彁楂樺叆搴撲紭鍏堢骇
+
+                            LogHelper.Info($"浠诲姟{wmsTask.S_CODE}瀹屾垚锛屽垽鏂叆搴撲紭鍏堢骇", "鍏ュ簱浼樺厛绾�);
+                            TaskProcess.inPri(wmsTask);
+                            TaskHelper.End(wmsTask); 
                             break;
                             case 7:
+
+                                var wcsTask1 = TaskHelper.GetTaskByWorkNo(wmsTask.S_OP_CODE, "wcs");
+                                if (wcsTask1!=null)
+                                {
+                                    //agv鎵ц閫氱煡 wcs鍙栨秷
+                                    WcsTask.WcsCallback(wmsTask, model.state, model.forklift_no);
+                                    if (!TaskHelper.CheckActionRecordExist(wcsTask1.S_CODE, "6"))
+                                    {
+                                        TaskHelper.Fail(wcsTask1);
+                                        TaskProcess.OperateStatus(wcsTask1, 7);
+                                    }
+                                }
+
                                 TaskHelper.Fail(wmsTask);
                                 TaskProcess.OperateStatus(wmsTask, 7);
                                 //鍏ュ簱鎴栬�鍥炲簱浠诲姟鍙栨秷鍒犻櫎鎵樼洏鐗╂枡
@@ -73,20 +90,19 @@
                                     ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
                                     ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
                                 }
-                                    //鍑哄簱鍙栨秷鍒ゆ柇鎺ラ┏浣嶆槸鍚︽湁璐э紝鏈夎揣闇�瑙g粦
-                                    if (!WcsTask.WcsCvstate(wmsTask))
-                                    {
-                                        LogHelper.Info($"Wcs绔嬪簱鎺ラ┏浣嶆棤璐э紝瑙g粦璐т綅:{wmsTask.S_START_LOC}", "绔嬪簱");
-                                        TaskProcess.OperateStatus(wmsTask, 4);
-                                        ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
-                                        ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
-                                    } 
-                                break;
+
+                                //鍑哄簱鍙栨秷鍒ゆ柇鎺ラ┏浣嶆槸鍚︽湁璐э紝鏈夎揣闇�瑙g粦
+                                if (!WcsTask.WcsCvstate(wmsTask))
+                                {
+                                    LogHelper.Info($"Wcs绔嬪簱鎺ラ┏浣嶆棤璐э紝瑙g粦璐т綅:{wmsTask.S_START_LOC}", "绔嬪簱");
+                                    TaskProcess.OperateStatus(wmsTask, 4);
+                                    ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
+                                    ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
+                                }
+                            break;
 
                         }
-                         TaskHelper.AddActionRecord(wmsTask.S_CODE, model.state, model.forklift_no, model.ext_data);
-                        //agv鎵ц閫氱煡
-                        //WcsTask.WcsCallback(wmsTask, model.state, model.forklift_no);
+                         TaskHelper.AddActionRecord(wmsTask.S_CODE, model.state, model.forklift_no, model.ext_data);          
                 }
                 else
                 {
@@ -94,7 +110,6 @@
                     TaskProcess.OperateReq(model.task_no, model.state, model.forklift_no, model.ext_data);
                 }
             }
-        
         }
       
 
@@ -111,7 +126,11 @@
             var list = TaskHelper.GetTaskListByState("鏈墽琛�, "agv");
             if (list.Count > 0) {
                 list.ForEach(task => {
+                    //浠诲姟鎷︽埅
+                    if (TaskHelper.Intercept())
+                    {
                         TaskProcess.SendTask(task);
+                    }
                 });     
             }
         }
@@ -127,7 +146,7 @@
             if (list.Count > 0)
             {
                 list.ForEach(task => {
-                    WcsTask.WcsTaskEntity(task);
+                        WcsTask.WcsTaskEntity(task);
                 });
             }
         }

--
Gitblit v1.9.1