From 265fbfa342cc03991c79934b162f26c0a6699f95 Mon Sep 17 00:00:00 2001 From: 海波 张 <2956280567@qq.com> Date: 星期五, 25 七月 2025 17:31:20 +0800 Subject: [PATCH] 0725 --- api/MoboxController.cs | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/api/MoboxController.cs b/api/MoboxController.cs index 227a20b..fed9a2b 100644 --- a/api/MoboxController.cs +++ b/api/MoboxController.cs @@ -78,8 +78,11 @@ if (wcsTask1 != null) { + if (wcsTask1.S_B_STATE != "鍙栨秷" && wcsTask1.S_B_STATE != "瀹屾垚") + { + TaskHelper.Fail(wcsTask1); + } TaskProcess.OperateStatus(wcsTask1, 7); - TaskHelper.Fail(wcsTask1); } } else @@ -146,6 +149,8 @@ } else { WmsTaskAction ac4 = TaskHelper.GetActionRecord(wmsTask.S_CODE, "4"); + + LogHelper.Info($"鏌ヨ浠诲姟{wmsTask.S_CODE}锛屾槸鍚﹀彇璐у畬鎴愶細" + JsonConvert.SerializeObject(ac4), "Mobox鍙栨秷"); if (ac4 != null) { ContainerHelper.delCntr(wmsTask.S_CNTR_CODE); @@ -192,16 +197,18 @@ } var transportTask = TaskHelper.GetTaskByNoType(model.TaskNo,"wcs"); + + if (transportTask != null) { - if (transportTask.S_TYPE == "鍙栨秷"|| transportTask.S_TYPE == "瀹屾垚") + if (transportTask.S_B_STATE == "鍙栨秷"|| transportTask.S_B_STATE == "瀹屾垚") { result.resultCode = 1; - result.resultMsg = $"{model.TaskNo},閫氱煡Wcs鍙栨秷浠诲姟澶辫触锛屼换鍔$姸鎬亄transportTask.S_TYPE}"; + result.resultMsg = $"{model.TaskNo},閫氱煡Wcs鍙栨秷浠诲姟澶辫触锛屼换鍔$姸鎬亄transportTask.S_B_STATE}"; LogHelper.Info($"CancelWcsTask杩斿洖:" + JsonConvert.SerializeObject(result), "Mobox鍙栨秷"); return result; } - if (transportTask.S_TYPE == "鏈墽琛�) + if (transportTask.S_B_STATE == "鏈墽琛�) { TaskHelper.Fail(transportTask); TaskProcess.OperateStatus(transportTask, 7); -- Gitblit v1.9.1