From 2efbd25f2160cb68cf2464f370aca3d1ea21f86f Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期三, 04 六月 2025 17:28:24 +0800
Subject: [PATCH] 入库优先级配置
---
core/TaskCore.cs | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/core/TaskCore.cs b/core/TaskCore.cs
index ed22626..4d8e582 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;
@@ -62,9 +63,27 @@
}
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);
//鍏ュ簱鎴栬�鍥炲簱浠诲姟鍙栨秷鍒犻櫎鎵樼洏鐗╂枡
@@ -80,13 +99,12 @@
TaskProcess.OperateStatus(wmsTask, 4);
ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
- }
- break;
+ }
+ break;
}
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 +129,11 @@
var list = TaskHelper.GetTaskListByState("鏈墽琛�, "agv");
if (list.Count > 0) {
list.ForEach(task => {
+ //浠诲姟鎷︽埅
+ if (TaskHelper.Intercept())
+ {
TaskProcess.SendTask(task);
+ }
});
}
}
@@ -127,7 +149,7 @@
if (list.Count > 0)
{
list.ForEach(task => {
- WcsTask.WcsTaskEntity(task);
+ WcsTask.WcsTaskEntity(task);
});
}
}
--
Gitblit v1.9.1