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 | 137 +++++++++++++++++++++++++++++++++------------
1 files changed, 100 insertions(+), 37 deletions(-)
diff --git a/core/Monitor.cs b/core/Monitor.cs
index fb5cd58..b65b40f 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -14,6 +14,7 @@
using System.Threading;
using System.Threading.Tasks;
using System.Web.Services.Description;
+using Top.Api;
using static HH.WCS.ZhongCeJinTan.api.ApiModel;
namespace HH.WCS.ZhongCeJinTan.core
@@ -171,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;
@@ -180,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);
//濡傛灉鏄簩娈典换鍔″垯涓嬪彂绔嬪簱浠诲姟
@@ -197,50 +198,112 @@
LogHelper.Info($"浠诲姟{wmsTask.S_CODE}瀹屾垚锛屽垽鏂叆搴撲紭鍏堢骇", "鍏ュ簱浼樺厛绾�);
TaskProcess.inPri(wmsTask);
TaskHelper.End(wmsTask);
-
break;
case 7:
- if (!LocationHelper.GetErroArea(wmsTask.S_END_AREA)) {
- TaskHelper.opMesTask(wmsTask, 3);
- }
-
var wcsTask1 = TaskHelper.GetTaskByWorkNo(wmsTask.S_OP_CODE, "wcs");
- if (wcsTask1 != null)
- {
- //agv鎵ц閫氱煡 wcs鍙栨秷
- WcsTask.WcsCallback(wmsTask, model.state, model.forklift_no.ToString());
- if (wcsTask1.S_B_STATE.Trim() != "鍙栨秷" && wcsTask1.S_B_STATE.Trim() != "澶辫触" && wcsTask1.S_B_STATE.Trim() != "瀹屾垚")
- {
- TaskHelper.Fail(wcsTask1);
- TaskProcess.OperateStatus(wcsTask1, 7);
- }
- }
-
- TaskHelper.Fail(wmsTask);
+ WmsTaskAction ac6 = TaskHelper.GetActionRecord(wmsTask.S_CODE, "6");
TaskProcess.OperateStatus(wmsTask, 7);
- //鍏ュ簱鎴栬�鍥炲簱浠诲姟鍙栨秷鍒犻櫎鎵樼洏鐗╂枡
- if (wmsTask.S_TYPE.Contains("鍏ュ簱") || wmsTask.S_TYPE.Contains("鍥炲簱"))
+ if (ac6 == null)
{
- ContainerHelper.delCntr(wmsTask.S_CNTR_CODE);
- ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE);
- ContainerHelper.delCntrLoc(wmsTask.S_CNTR_CODE);
- }
- else {
- //鍑哄簱鍙栨秷鍒ゆ柇鎺ラ┏浣嶆槸鍚︽湁璐э紝鏈夎揣闇�瑙ｇ粦
- if (!WcsTask.WcsCvstate(wmsTask))
+ TaskHelper.Fail(wmsTask);
+ //鍏ュ簱鎴栬�鍥炲簱浠诲姟鍙栨秷鍒犻櫎鎵樼洏鐗╂枡
+ if (wmsTask.S_TYPE.Contains("鍏ュ簱") || wmsTask.S_TYPE.Contains("鍥炲簱") || LocationHelper.GetErroArea(wmsTask.S_END_AREA))
{
- LogHelper.Info($"Wcs绔嬪簱鎺ラ┏浣嶆棤璐э紝瑙ｇ粦璐т綅:{wmsTask.S_START_LOC}", "绔嬪簱");
- TaskProcess.OperateStatus(wmsTask, 4);
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!="鍙栨秷"&& wcsTask1.S_B_STATE != "瀹屾垚") {
+ TaskHelper.Fail(wcsTask1);
+ }
+ TaskProcess.OperateStatus(wcsTask1, 7);
}
}
-
-
-
- break;
+ 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)
+ {
+ if (!string.IsNullOrEmpty(wmsWork.CONNECTION))
+ {
+ var agvTask = LocationHelper.GetConnectionTask(wmsWork.CONNECTION, "agv",wmsTask.T_CREATE);
+ LogHelper.Info($"鍙栨秷浠诲姟{wmsTask.S_CODE}锛屽綋鍓嶆帴椹充綅{wmsWork.CONNECTION}锛岀涓�釜agv浠诲姟淇℃伅" + JsonConvert.SerializeObject(agvTask), "agv鍔ㄤ綔缂撳瓨");
+ if (agvTask != null)
+ {
+ WmsTaskAction qh = TaskHelper.GetActionRecord(agvTask.S_CODE, "4");
+ //宸茬粡鍙栬揣瀹屾垚
+ if (qh != null)
+ {
+ if (WcsTask.WcsCvstate(wmsTask))
+ {
+ LogHelper.Info($"Wcs绔嬪簱鎺ラ┏浣嶆湁璐э紝瑙ｇ粦璐т綅:{wmsTask.S_END_LOC}", "鏄惁鏈夎揣");
+ 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);
+ }
+ }
+ }
+ }
+ }
+ break;
}
TaskHelper.AddActionRecord(wmsTask.S_CODE, model.state, model.forklift_no, model.ext_data);
}
@@ -347,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