From 265fbfa342cc03991c79934b162f26c0a6699f95 Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期五, 25 七月 2025 17:31:20 +0800
Subject: [PATCH] 0725
---
core/Monitor.cs | 129 +++++++++++++++++++++---------------------
1 files changed, 65 insertions(+), 64 deletions(-)
diff --git a/core/Monitor.cs b/core/Monitor.cs
index de34003..5b937db 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -200,80 +200,69 @@
TaskHelper.End(wmsTask);
break;
case 7:
+ var wcsTask1 = TaskHelper.GetTaskByWorkNo(wmsTask.S_OP_CODE, "wcs");
+
+ WmsTaskAction ac6 = TaskHelper.GetActionRecord(wmsTask.S_CODE, "6");
TaskProcess.OperateStatus(wmsTask, 7);
- WmsTaskAction ac4 = TaskHelper.GetActionRecord(wmsTask.S_CODE, "4");
- //宸茬粡鍙栬揣瀹屾垚
- if (ac4 != null)
+ if (ac6 == 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 (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);
}
- 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)
{
- TaskProcess.OperateStatus(wcsTask1, 7);
-
- 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());
- }
- }
- }
- }
-
-
- WmsTaskAction ac6 = TaskHelper.GetActionRecord(wmsTask.S_CODE, "6");
- if (ac6==null)
- {
- //鍏ュ簱鎴栬�鍥炲簱浠诲姟鍙栨秷鍒犻櫎鎵樼洏鐗╂枡
- 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);
+ if (wcsTask1.S_B_STATE!="鍙栨秷"&& wcsTask1.S_B_STATE != "瀹屾垚") {
+ TaskHelper.Fail(wcsTask1);
+ }
+ TaskProcess.OperateStatus(wcsTask1, 7);
}
}
+ 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("鍑哄簱"))
{
@@ -297,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);
}
}
}
@@ -409,9 +410,9 @@
}
+ //浜屽悎涓�簱鍖洪渶瑕佸尯鍒�
-
- //瀵绘壘绔嬪簱鍖虹┖鎵�+ //瀵绘壘绔嬪簱鍖虹┖鎵�
start = LocationHelper.FindStartcolByLoclistAndcntr(strrtList, workFlow.STARTAREA,workFlow.CONNECTION);
--
Gitblit v1.9.1