From 3a56820d028e98ac3c4bd315aa76181d7d6720cd Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期一, 28 七月 2025 17:29:57 +0800
Subject: [PATCH] 金坛二合一出库修改
---
core/Monitor.cs | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/core/Monitor.cs b/core/Monitor.cs
index a4a8cc1..b65b40f 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -172,7 +172,7 @@
break;
case 4:
TaskHelper.UpdateStatus(wmsTask, "鍙栬揣瀹屾垚");
- LocationHelper.UnLockLoc(wmsTask.S_START_LOC);
+ //LocationHelper.UnLockLoc(wmsTask.S_START_LOC);
TaskProcess.OperateStatus(wmsTask, 4);
TaskHelper.opMesTask(wmsTask, 1);
break;
@@ -181,7 +181,7 @@
break;
case 6:
TaskHelper.UpdateStatus(wmsTask, "鍗歌揣瀹屾垚");
- LocationHelper.UnLockLoc(wmsTask.S_END_LOC);
+ //LocationHelper.UnLockLoc(wmsTask.S_END_LOC);
TaskProcess.OperateStatus(wmsTask, 6);
//濡傛灉鏄簩娈典换鍔″垯涓嬪彂绔嬪簱浠诲姟
@@ -203,9 +203,9 @@
var wcsTask1 = TaskHelper.GetTaskByWorkNo(wmsTask.S_OP_CODE, "wcs");
WmsTaskAction ac6 = TaskHelper.GetActionRecord(wmsTask.S_CODE, "6");
+ TaskProcess.OperateStatus(wmsTask, 7);
if (ac6 == null)
{
- TaskProcess.OperateStatus(wmsTask, 7);
TaskHelper.Fail(wmsTask);
//鍏ュ簱鎴栬�鍥炲簱浠诲姟鍙栨秷鍒犻櫎鎵樼洏鐗╂枡
if (wmsTask.S_TYPE.Contains("鍏ュ簱") || wmsTask.S_TYPE.Contains("鍥炲簱") || LocationHelper.GetErroArea(wmsTask.S_END_AREA))
@@ -221,8 +221,10 @@
if (wcsTask1 != null)
{
+ if (wcsTask1.S_B_STATE!="鍙栨秷"&& wcsTask1.S_B_STATE != "瀹屾垚") {
+ TaskHelper.Fail(wcsTask1);
+ }
TaskProcess.OperateStatus(wcsTask1, 7);
- TaskHelper.Fail(wcsTask1);
}
}
else {
@@ -284,6 +286,18 @@
ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
}
+ }
+ }
+ else
+ {
+ WmsTaskAction ac4 = TaskHelper.GetActionRecord(wmsTask.S_CODE, "4");
+
+ LogHelper.Info($"鏌ヨ浠诲姟{wmsTask.S_CODE}锛屾槸鍚﹀彇璐у畬鎴愶細" + JsonConvert.SerializeObject(ac4), "agv鍔ㄤ綔缂撳瓨");
+ if (ac4 != null)
+ {
+ ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
+ ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
+ ContainerHelper.delCntrLoc(wmsTask.S_CNTR_CODE);
}
}
}
@@ -396,10 +410,10 @@
}
+ //浜屽悎涓�簱鍖洪渶瑕佸尯鍒�
-
- //瀵绘壘绔嬪簱鍖虹┖鎵�- start = LocationHelper.FindStartcolByLoclistAndcntr(strrtList, workFlow.STARTAREA,workFlow.CONNECTION);
+ //瀵绘壘绔嬪簱鍖虹┖鎵�
+ start = LocationHelper.FindStartcolByLoclistAndcntr(strrtList, workFlow.STARTAREA,workFlow.CONNECTION,workFlow.TOOLSTYPE);
LogHelper.Info($"绌烘墭{kt.task_no}鍑哄簱浠诲姟涓嬪彂璧风偣淇℃伅" + JsonConvert.SerializeObject(start), "绌烘墭鍑哄簱");
--
Gitblit v1.9.1