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 | 140 +++++++++++++++++++++++----------------------- 1 files changed, 70 insertions(+), 70 deletions(-) diff --git a/core/Monitor.cs b/core/Monitor.cs index 2410932..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); //濡傛灉鏄簩娈典换鍔″垯涓嬪彂绔嬪簱浠诲姟 @@ -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("鍑哄簱")) { @@ -291,13 +280,24 @@ //宸茬粡鍙栬揣瀹屾垚 if (qh != null) { - if (!WcsTask.WcsCvstate(wmsTask)) + if (WcsTask.WcsCvstate(wmsTask)) { - LogHelper.Info($"Wcs绔嬪簱鎺ラ┏浣嶆棤璐э紝瑙g粦璐т綅:{wmsTask.S_START_LOC}", "绔嬪簱"); - TaskProcess.OperateStatus(wmsTask, 4); + LogHelper.Info($"Wcs绔嬪簱鎺ラ┏浣嶆湁璐э紝瑙g粦璐т綅:{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); } } } @@ -410,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