From 2cb1fca5b2d7bcd9e7b7536b06cf4200bd0cb94c Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期三, 23 七月 2025 17:29:25 +0800
Subject: [PATCH] 退库修改
---
core/Monitor.cs | 116 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 60 insertions(+), 56 deletions(-)
diff --git a/core/Monitor.cs b/core/Monitor.cs
index 620b137..a4a8cc1 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -200,65 +200,70 @@
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)
- {
-
- }
+ var wcsTask1 = TaskHelper.GetTaskByWorkNo(wmsTask.S_OP_CODE, "wcs");
- var wcsTask1 = TaskHelper.GetTaskByWorkNo(wmsTask.S_OP_CODE, "wcs");
+ WmsTaskAction ac6 = TaskHelper.GetActionRecord(wmsTask.S_CODE, "6");
+ 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))
+ {
+ ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
+ ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
+ ContainerHelper.delCntrLoc(wmsTask.S_CNTR_CODE);
+ }
+ if (!LocationHelper.GetErroArea(wmsTask.S_END_AREA))
+ {
+ TaskHelper.opMesTask(wmsTask, 3);
+ }
+
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");
- if ((ac1101 != null))
- {
- if (ac1102 == null)
- {
- //agv鎵ц閫氱煡 wcs鍙栨秷
- WcsTask.WcsCallback(wmsTask, model.state, model.forklift_no.ToString());
- }
- }
- }
- else
- {
- WmsTaskAction ac1103 = TaskHelper.GetActionRecord(wmsTask.S_CODE, "1103");
- WmsTaskAction ac1104 = TaskHelper.GetActionRecord(wmsTask.S_CODE, "1104");
- if ((ac1103 != null))
- {
- if (ac1104 == null)
- {
- //agv鎵ц閫氱煡 wcs鍙栨秷
- WcsTask.WcsCallback(wmsTask, model.state, model.forklift_no.ToString());
- }
- }
- }
- }
+ TaskProcess.OperateStatus(wcsTask1, 7);
+ TaskHelper.Fail(wcsTask1);
}
-
-
- //鍏ュ簱鎴栬�鍥炲簱浠诲姟鍙栨秷鍒犻櫎鎵樼洏鐗╂枡
- 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 {
+ //鏀跺埌6寮哄埗瀹屾垚
+ TaskHelper.End(wmsTask);
+ }
+
+ if (wcsTask1 != null)
+ {
+ if (wmsTask.S_TYPE.Contains("鍑哄簱"))
+ {
+ var ac1101 = TaskHelper.GetWcsSafety(wmsTask.S_CODE, "1101");
+ var ac1102 = TaskHelper.GetWcsSafety(wmsTask.S_CODE, "1102");
+ if ((ac1101 != null))
+ {
+ if (ac1102 == null)
+ {
+ //agv鎵ц閫氱煡 wcs鍙栨秷
+ WcsTask.WcsCallback(wmsTask, model.state, model.forklift_no.ToString());
+ }
+ }
+ }
+ else
+ {
+ var ac1103 = TaskHelper.GetWcsSafety(wmsTask.S_CODE, "1103");
+ var ac1104 = TaskHelper.GetWcsSafety(wmsTask.S_CODE, "1104");
+
+ if ((ac1103 != null))
+ {
+ if (ac1104 == null)
+ {
+ //agv鎵ц閫氱煡 wcs鍙栨秷
+ WcsTask.WcsCallback(wmsTask, model.state, model.forklift_no.ToString());
+ }
+ }
+ }
+ }
+
+
+ if (wmsTask.S_TYPE.Contains("鍑哄簱"))
+ {
//鍑哄簱鍙栨秷鍒ゆ柇鎺ラ┏浣嶆槸鍚︽湁璐э紝鏈夎揣闇�瑙ｇ粦
var wmsWork = TaskHelper.GetWmsWork(wmsTask.S_OP_CODE);
if (wmsWork != null)
@@ -273,10 +278,9 @@
//宸茬粡鍙栬揣瀹屾垚
if (qh != null)
{
- if (!WcsTask.WcsCvstate(wmsTask))
+ if (WcsTask.WcsCvstate(wmsTask))
{
- LogHelper.Info($"Wcs绔嬪簱鎺ラ┏浣嶆棤璐э紝瑙ｇ粦璐т綅:{wmsTask.S_START_LOC}", "绔嬪簱");
- TaskProcess.OperateStatus(wmsTask, 4);
+ LogHelper.Info($"Wcs绔嬪簱鎺ラ┏浣嶆湁璐э紝瑙ｇ粦璐т綅:{wmsTask.S_END_LOC}", "鏄惁鏈夎揣");
ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
}
--
Gitblit v1.9.1