From 00b6105b34870f6f5a33551534d0088f3f741906 Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期一, 07 七月 2025 17:33:53 +0800
Subject: [PATCH] 退库修改
---
core/Monitor.cs | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/core/Monitor.cs b/core/Monitor.cs
index e625389..0f1e4ee 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -157,6 +157,7 @@
TaskHelper.Begin(wmsTask, model.forklift_no);
//鑳庨潰浜や簰
TaskHelper.TmSafety(wmsTask);
+ TaskHelper.opMesTask(wmsTask,1);
break;
case 3:
TaskHelper.UpdateStatus(wmsTask, "寮�鍙栬揣");
@@ -188,20 +189,21 @@
LogHelper.Info($"浠诲姟{wmsTask.S_CODE}瀹屾垚锛屽垽鏂叆搴撲紭鍏堢骇", "鍏ュ簱浼樺厛绾�);
TaskProcess.inPri(wmsTask);
TaskHelper.End(wmsTask);
+ TaskHelper.opMesTask(wmsTask, 2);
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"))
+ var wcsTask1 = TaskHelper.GetTaskByWorkNo(wmsTask.S_OP_CODE, "wcs");
+ if (wcsTask1 != null)
{
+ //agv鎵ц閫氱煡 wcs鍙栨秷
+ if (wcsTask1.S_B_STATE != "鏈墽琛� && wcsTask1.S_B_STATE != "瀹屾垚" && wcsTask1.S_B_STATE != "鍙栨秷")
+ {
+ WcsTask.WcsCallback(wmsTask, model.state, model.forklift_no.ToString());
+ }
TaskHelper.Fail(wcsTask1);
TaskProcess.OperateStatus(wcsTask1, 7);
}
- }
+
TaskHelper.Fail(wmsTask);
TaskProcess.OperateStatus(wmsTask, 7);
@@ -220,6 +222,7 @@
ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
}
+ TaskHelper.opMesTask(wmsTask, 3);
break;
}
@@ -353,15 +356,14 @@
var cntrCode = LocationHelper.GetLocCntrCode(start.S_CODE);
if (workFlow.SENDWCS == "Y")
- {
-
+ {
//姝ｅ紡浠ｇ爜锛岃皟鐢ㄦ帴鍙ｅ鎵惧彲鐢ㄦ帴椹充綅
var connectionList = LocationHelper.GetConnectionList(workFlow.CONNECTION);
var balanceConnectionList = LocationHelper.GetBalanceConnectionList(connectionList);
foreach (var item in balanceConnectionList)
{
- if (item.loc.N_CURRENT_NUM < 2)
+ if (item.loc.N_CURRENT_NUM < 2 && item.loc.CONNEC_ROADWAY == start.N_ROADWAY)
{
connection = item.loc.S_CODE;
connectionArea = item.loc.S_AREA_Name;
--
Gitblit v1.9.1