From b346c6a0631d992e66823d9364ef47429715c546 Mon Sep 17 00:00:00 2001 From: 海波 张 <2956280567@qq.com> Date: 星期一, 16 六月 2025 17:34:49 +0800 Subject: [PATCH] 1 --- core/TaskCore.cs | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-) diff --git a/core/TaskCore.cs b/core/TaskCore.cs index 3108067..3fa9e5d 100644 --- a/core/TaskCore.cs +++ b/core/TaskCore.cs @@ -20,7 +20,6 @@ internal class TaskCore { public static void OperateTaskStatus(AgvTaskState model) { - var wmsTask = TaskHelper.GetTask(model.task_no); var db = new SqlHelper<object>().GetInstance(); @@ -63,7 +62,11 @@ } break; case 2: - TaskHelper.End(wmsTask); + //绌烘墭鍑烘垨鑰呮弧鎵樺嚭浠诲姟瀹屾垚鍒ゆ柇鏄惁瑕佹彁楂樺叆搴撲紭鍏堢骇 + + LogHelper.Info($"浠诲姟{wmsTask.S_CODE}瀹屾垚锛屽垽鏂叆搴撲紭鍏堢骇", "鍏ュ簱浼樺厛绾�); + TaskProcess.inPri(wmsTask); + TaskHelper.End(wmsTask); break; case 7: @@ -78,7 +81,6 @@ TaskProcess.OperateStatus(wcsTask1, 7); } } - TaskHelper.Fail(wmsTask); TaskProcess.OperateStatus(wmsTask, 7); @@ -88,19 +90,19 @@ ContainerHelper.delCntr(wmsTask.S_CNTR_CODE); ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE); } - //鍑哄簱鍙栨秷鍒ゆ柇鎺ラ┏浣嶆槸鍚︽湁璐э紝鏈夎揣闇�瑙g粦 - if (!WcsTask.WcsCvstate(wmsTask)) - { - LogHelper.Info($"Wcs绔嬪簱鎺ラ┏浣嶆棤璐э紝瑙g粦璐т綅:{wmsTask.S_START_LOC}", "绔嬪簱"); - TaskProcess.OperateStatus(wmsTask, 4); - ContainerHelper.delCntr(wmsTask.S_CNTR_CODE); - ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE); - } - break; + + //鍑哄簱鍙栨秷鍒ゆ柇鎺ラ┏浣嶆槸鍚︽湁璐э紝鏈夎揣闇�瑙g粦 + if (!WcsTask.WcsCvstate(wmsTask)) + { + LogHelper.Info($"Wcs绔嬪簱鎺ラ┏浣嶆棤璐э紝瑙g粦璐т綅:{wmsTask.S_START_LOC}", "绔嬪簱"); + TaskProcess.OperateStatus(wmsTask, 4); + ContainerHelper.delCntr(wmsTask.S_CNTR_CODE); + ContainerHelper.delCntrItem(wmsTask.S_CNTR_CODE); + } + break; } - TaskHelper.AddActionRecord(wmsTask.S_CODE, model.state, model.forklift_no, model.ext_data); - + TaskHelper.AddActionRecord(wmsTask.S_CODE, model.state, model.forklift_no, model.ext_data); } else { @@ -108,7 +110,6 @@ TaskProcess.OperateReq(model.task_no, model.state, model.forklift_no, model.ext_data); } } - } -- Gitblit v1.9.1