From d0c1502a17c8d945e16b498792bd8e50ea9fea9f Mon Sep 17 00:00:00 2001 From: jinxin <1013386558@qq.com> Date: 星期二, 03 六月 2025 14:11:04 +0800 Subject: [PATCH] 111 --- HH.WCS.Mobox3.WeiLi/api/MoboxController.cs | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/HH.WCS.Mobox3.WeiLi/api/MoboxController.cs b/HH.WCS.Mobox3.WeiLi/api/MoboxController.cs index ae3abf2..ece8c93 100644 --- a/HH.WCS.Mobox3.WeiLi/api/MoboxController.cs +++ b/HH.WCS.Mobox3.WeiLi/api/MoboxController.cs @@ -30,6 +30,7 @@ var wmsTask = WMSHelper.GetWmsTask(task.S_OP_CODE); if (wmsTask != null) { + if (task.N_B_STATE == 0) { //绛夊緟鐩存帴淇敼鐘舵�涓哄彇娑�@@ -49,7 +50,7 @@ //宸叉帹閫佷絾鏄病鏈夊畬鎴愭垨鑰呭彇娑堬紝閫氱煡hosttoagv NDCApi.CancelOrder(task.S_CODE.Trim()); } - else + else { TaskProcess.Cancel(task); TaskProcess.OperateStatus(task, 7); @@ -64,8 +65,9 @@ result.resultCode = 1; result.resultMsg = "浠诲姟宸茬粨鏉�; } + } - else + else { result.resultCode = 1; result.resultMsg = "浠诲姟鎵�鐨勪綔涓氫笉瀛樺湪"; @@ -98,7 +100,7 @@ WMSHelper.UpdateTaskState(op); result.resultMsg = "浠诲姟绛夊緟锛岀洿鎺ュ彇娑�; } - else if (op.N_B_STATE ==1) + else if (op.N_B_STATE == 1) { //宸叉帹閫佷絾鏄病鏈夊畬鎴愭垨鑰呭彇娑堬紝閫氱煡hosttoagv //NDCHelper.Cancel(task.S_CODE.Trim()); @@ -270,7 +272,18 @@ return ApiHelper.WeiLiDisbutionIn(model); } - + /// <summary> + /// PDA鍒嗘嫞鍥�+ /// </summary> + /// <param name="model"></param> + /// <returns></returns> + [HttpPost] + [Route("ErrorOperation")] + public SimpleResult ErrorOperation(MoboxOperationBase model) + { + LogHelper.Info($"娓呴櫎閿欒浣滀笟 鍏ュ弬={JsonConvert.SerializeObject(model)}"); + return ApiHelper.ErrorOperation(model); + } ///// <summary> ///// 鍛煎彨绌烘 -- Gitblit v1.9.1