From 62c5a7fad29fa380874f6cf81bb4074ce5f488e7 Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期五, 30 五月 2025 17:32:06 +0800
Subject: [PATCH] 优先级修改
---
core/TaskCore.cs | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/core/TaskCore.cs b/core/TaskCore.cs
index ed22626..3108067 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;
@@ -33,7 +34,7 @@
switch (model.state)
{
case 1:
- TaskHelper.Begin(wmsTask);
+ TaskHelper.Begin(wmsTask,model.forklift_no);
//鑳庨潰浜や簰
TaskHelper.TmSafety(wmsTask);
break;
@@ -65,6 +66,20 @@
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);
//鍏ュ簱鎴栬�鍥炲簱浠诲姟鍙栨秷鍒犻櫎鎵樼洏鐗╂枡
@@ -85,8 +100,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 +125,11 @@
var list = TaskHelper.GetTaskListByState("鏈墽琛�, "agv");
if (list.Count > 0) {
list.ForEach(task => {
+ //浠诲姟鎷︽埅
+ if (TaskHelper.Intercept())
+ {
TaskProcess.SendTask(task);
+ }
});
}
}
@@ -127,7 +145,7 @@
if (list.Count > 0)
{
list.ForEach(task => {
- WcsTask.WcsTaskEntity(task);
+ WcsTask.WcsTaskEntity(task);
});
}
}
--
Gitblit v1.9.1