From 225a85b1a55f4475ba4441b3ed350e0df35ff735 Mon Sep 17 00:00:00 2001 From: yuyou_x <2336760928@qq.com> Date: 星期二, 26 三月 2024 08:22:36 +0800 Subject: [PATCH] 点击取消移库任务时无法将目标储位与起始储位恢复,扫描完箱码数量后,未显示出向内条码信息。 取消分配后 点击编辑库存数量显示错误,锁定数量超出库存数量,添加明细时获取的物料信息存在问题。 --- Wms/Wms/Controllers/BllCheckController.cs | 63 +++++++++++++++++++++++++++++++ 1 files changed, 63 insertions(+), 0 deletions(-) diff --git a/Wms/Wms/Controllers/BllCheckController.cs b/Wms/Wms/Controllers/BllCheckController.cs index 9a1220f..0791db7 100644 --- a/Wms/Wms/Controllers/BllCheckController.cs +++ b/Wms/Wms/Controllers/BllCheckController.cs @@ -405,5 +405,68 @@ #endregion + + #region AGV杞繍 + /// <summary> + /// AGV绉诲簱瀹屾垚 + /// </summary> + /// <param name="model"></param> + /// <returns></returns> + [HttpPost] + public IActionResult FinishMoveTask(CheckTaskVm model) + { + try + { + //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D + var claimsIdentity = this.User.Identity as ClaimsIdentity; + if (claimsIdentity == null) + { + return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" }); + } + var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value; + if (string.IsNullOrWhiteSpace(userId)) + { + return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" }); + } + _stockCheckSvc.MoveSuccess(model.taskNo, int.Parse(userId)); + + return Ok(new { code = 0, msg = "鎴愬姛瀹屾垚浠诲姟", data = "" }); + } + catch (Exception e) + { + return Ok(new { code = 1, msg = e.Message }); + } + } + /// <summary> + /// 鍙栨秷AGV绉诲簱浠诲姟 + /// </summary> + /// <param name="model"></param> + /// <returns></returns> + [HttpPost] + public IActionResult CancelMoveTask(CheckTaskVm model) + { + try + { + //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D + var claimsIdentity = this.User.Identity as ClaimsIdentity; + if (claimsIdentity == null) + { + return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" }); + } + var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value; + if (string.IsNullOrWhiteSpace(userId)) + { + return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" }); + } + _stockCheckSvc.CancelMoveTask(model.taskNo, int.Parse(userId)); + + return Ok(new { code = 0, msg = "鎴愬姛鍙栨秷浠诲姟", data = "" }); + } + catch (Exception e) + { + return Ok(new { code = 1, msg = e.Message }); + } + } + #endregion } } -- Gitblit v1.8.0