From 04eed9fb0fdb0a4c09c482f78d4449f941cfaadb Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期三, 14 五月 2025 17:24:06 +0800
Subject: [PATCH] 金坛bug修改

---
 core/TaskCore.cs |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/core/TaskCore.cs b/core/TaskCore.cs
index ed22626..c4fd023 100644
--- a/core/TaskCore.cs
+++ b/core/TaskCore.cs
@@ -33,7 +33,7 @@
                         switch (model.state)
                         {
                             case 1:
-                                TaskHelper.Begin(wmsTask);
+                                TaskHelper.Begin(wmsTask,model.forklift_no);
                                 //鑳庨潰浜や簰
                                 TaskHelper.TmSafety(wmsTask);
                                 break;
@@ -65,6 +65,10 @@
                                 TaskHelper.End(wmsTask); 
                             break;
                             case 7:
+                                //agv鎵ц閫氱煡
+                                WcsTask.WcsCallback(wmsTask, model.state, model.forklift_no);
+
+
                                 TaskHelper.Fail(wmsTask);
                                 TaskProcess.OperateStatus(wmsTask, 7);
                                 //鍏ュ簱鎴栬�鍥炲簱浠诲姟鍙栨秷鍒犻櫎鎵樼洏鐗╂枡
@@ -85,8 +89,7 @@
 
                         }
                          TaskHelper.AddActionRecord(wmsTask.S_CODE, model.state, model.forklift_no, model.ext_data);
-                        //agv鎵ц閫氱煡
-                        //WcsTask.WcsCallback(wmsTask, model.state, model.forklift_no);
+                        
                 }
                 else
                 {
@@ -111,7 +114,11 @@
             var list = TaskHelper.GetTaskListByState("鏈墽琛�, "agv");
             if (list.Count > 0) {
                 list.ForEach(task => {
+                    //浠诲姟鎷︽埅
+                    if (TaskHelper.Intercept())
+                    {
                         TaskProcess.SendTask(task);
+                    }
                 });     
             }
         }
@@ -127,7 +134,7 @@
             if (list.Count > 0)
             {
                 list.ForEach(task => {
-                    WcsTask.WcsTaskEntity(task);
+                        WcsTask.WcsTaskEntity(task);
                 });
             }
         }

--
Gitblit v1.9.1