From 30b008a25cc30a32f1e2fdee4a34ae71146e990e Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期一, 21 七月 2025 17:28:09 +0800
Subject: [PATCH] 取消，异常流程，修改
---
core/Monitor.cs | 66 +++++++++++++++++++++------------
1 files changed, 42 insertions(+), 24 deletions(-)
diff --git a/core/Monitor.cs b/core/Monitor.cs
index 620b137..2410932 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -200,31 +200,43 @@
TaskHelper.End(wmsTask);
break;
case 7:
- if (!LocationHelper.GetErroArea(wmsTask.S_END_AREA)) {
- TaskHelper.opMesTask(wmsTask, 3);
- }
- TaskHelper.Fail(wmsTask);
TaskProcess.OperateStatus(wmsTask, 7);
-
-
WmsTaskAction ac4 = TaskHelper.GetActionRecord(wmsTask.S_CODE, "4");
//宸茬粡鍙栬揣瀹屾垚
if (ac4 != null)
- {
-
+ {
+ TaskHelper.End(wmsTask);
+ //濡傛灉鏄簩娈典换鍔″垯涓嬪彂绔嬪簱浠诲姟
+ var wcsTask2 = TaskHelper.GetTaskByState("鏈墽琛�, "wcs", wmsTask.S_OP_CODE, "鍏ュ簱");
+ if (wcsTask2 != null)
+ {
+ LocationHelper.LockLoc(wcsTask2.S_START_LOC, "鍑哄簱閿�, 2);
+ WcsTask.WcsTaskEntity(wcsTask2);
+ }
+ }
+ else {
+ TaskHelper.Fail(wmsTask);
+ if (!LocationHelper.GetErroArea(wmsTask.S_END_AREA))
+ {
+ TaskHelper.opMesTask(wmsTask, 3);
+ }
+ else
+ {
+ ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
+ ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
+ ContainerHelper.delCntrLoc(wmsTask.S_CNTR_CODE);
+ }
}
var wcsTask1 = TaskHelper.GetTaskByWorkNo(wmsTask.S_OP_CODE, "wcs");
if (wcsTask1 != null)
{
- if (wcsTask1.S_B_STATE.Trim() != "鍙栨秷" && wcsTask1.S_B_STATE.Trim() != "澶辫触" && wcsTask1.S_B_STATE.Trim() != "瀹屾垚")
- {
- TaskHelper.Fail(wcsTask1);
TaskProcess.OperateStatus(wcsTask1, 7);
+
if (wmsTask.S_TYPE.Contains("鍑哄簱"))
{
- WmsTaskAction ac1101 = TaskHelper.GetActionRecord(wmsTask.S_CODE, "1101");
- WmsTaskAction ac1102 = TaskHelper.GetActionRecord(wmsTask.S_CODE, "1102");
+ var ac1101 = TaskHelper.GetWcsSafety(wmsTask.S_CODE, "1101");
+ var ac1102 = TaskHelper.GetWcsSafety(wmsTask.S_CODE, "1102");
if ((ac1101 != null))
{
if (ac1102 == null)
@@ -236,8 +248,9 @@
}
else
{
- WmsTaskAction ac1103 = TaskHelper.GetActionRecord(wmsTask.S_CODE, "1103");
- WmsTaskAction ac1104 = TaskHelper.GetActionRecord(wmsTask.S_CODE, "1104");
+ var ac1103 = TaskHelper.GetWcsSafety(wmsTask.S_CODE, "1103");
+ var ac1104 = TaskHelper.GetWcsSafety(wmsTask.S_CODE, "1104");
+
if ((ac1103 != null))
{
if (ac1104 == null)
@@ -247,18 +260,23 @@
}
}
}
- }
}
-
-
- //鍏ュ簱鎴栬�鍥炲簱浠诲姟鍙栨秷鍒犻櫎鎵樼洏鐗╂枡
- if (wmsTask.S_TYPE.Contains("鍏ュ簱") || wmsTask.S_TYPE.Contains("鍥炲簱"))
+
+
+ WmsTaskAction ac6 = TaskHelper.GetActionRecord(wmsTask.S_CODE, "6");
+ if (ac6==null)
{
- ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
- ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
- ContainerHelper.delCntrLoc(wmsTask.S_CNTR_CODE);
+ //鍏ュ簱鎴栬�鍥炲簱浠诲姟鍙栨秷鍒犻櫎鎵樼洏鐗╂枡
+ if (wmsTask.S_TYPE.Contains("鍏ュ簱") || wmsTask.S_TYPE.Contains("鍥炲簱"))
+ {
+ ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
+ ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
+ ContainerHelper.delCntrLoc(wmsTask.S_CNTR_CODE);
+ }
}
- else {
+
+ if (wmsTask.S_TYPE.Contains("鍑哄簱"))
+ {
//鍑哄簱鍙栨秷鍒ゆ柇鎺ラ┏浣嶆槸鍚︽湁璐э紝鏈夎揣闇�瑙ｇ粦
var wmsWork = TaskHelper.GetWmsWork(wmsTask.S_OP_CODE);
if (wmsWork != null)
--
Gitblit v1.9.1