From ecb386a4201213c6635f28f9e9e02e3faf217b51 Mon Sep 17 00:00:00 2001 From: yuyou_x <2336760928@qq.com> Date: 星期六, 16 三月 2024 11:08:34 +0800 Subject: [PATCH] 修改储位图例柱状图以及圆形图显示数据问题。 --- Wms/Wms/Controllers/PdaAsnController.cs | 93 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 93 insertions(+), 0 deletions(-) diff --git a/Wms/Wms/Controllers/PdaAsnController.cs b/Wms/Wms/Controllers/PdaAsnController.cs index 384d831..9fdbda8 100644 --- a/Wms/Wms/Controllers/PdaAsnController.cs +++ b/Wms/Wms/Controllers/PdaAsnController.cs @@ -46,6 +46,33 @@ } /// <summary> + /// 鏍规嵁鍏ュ簱鍗曡幏鍙栧叆搴撴�诲崟淇℃伅 + /// </summary> + /// <param name="model">ASNNo:鍏ュ簱鍗曞彿</param> + /// <returns></returns> + [HttpPost] + public IActionResult GetArrivalNotice(ArrivalNoticeVm model) + { + try + { + var models = _PdaAsnSvc.GetArrivalNotice(model); + + if (models == null) + { + return Ok(new { code = 1, msg = "鍏ュ簱鍗曚俊鎭�", data = models }); + } + else + { + return Ok(new { code = 0, msg = "鍏ュ簱鍗曚俊鎭�", data = models }); + } + } + catch (Exception e) + { + return Ok(new { code = 1, msg = e.Message }); + } + } + + /// <summary> /// 鍒ゆ柇鎵樼洏鏄惁鍙敤 /// </summary> /// <param name="model">PalletNo锛氭墭鐩樻潯鐮�</param> @@ -383,6 +410,26 @@ return Ok(new { code = 1, msg = e.Message }); } } + + /// <summary> + /// 楠岃瘉鍌ㄤ綅(鍦扮爜)鏄惁鍙敤 + /// </summary> + /// <param name="model">LocatNo鍌ㄤ綅鍦板潃</param> + /// <returns></returns> + [HttpPost] + public IActionResult CheckLocatNo(PalletBindVm model) + { + try + { + var result = _PdaAsnSvc.CheckLocatNo(model.LocatNo); + + return Ok(new { code = 0, msg = "楠岃瘉鎴愬姛!", data = result }); + } + catch (Exception e) + { + return Ok(new { code = 1, msg = e.Message }); + } + } #endregion #region 闆剁鍏ュ簱 @@ -462,7 +509,20 @@ return Ok(new { code = 1, msg = e.Message }); } } + [HttpPost] + public IActionResult GetBindArrivalNoticeDetails(ArrivalNoticeVm model) + { + try + { + var models = _PdaAsnSvc.GetBindArrivalNoticeDetails(model); + return Ok(new { code = 0, msg = "鍏ュ簱鍗曟槑缁嗕俊鎭�", data = models }); + } + catch (Exception e) + { + return Ok(new { code = 1, msg = e.Message }); + } + } /// <summary> /// 缁戝畾鎵樼洏 @@ -495,5 +555,38 @@ } } #endregion + + #region 骞冲簱鍏ュ簱 + /// <summary> + /// 骞冲簱纭鍏ュ簱 + /// </summary> + /// <param name="model"></param> + /// <returns></returns> + [HttpPost] + public IActionResult ConfirmInStock(PalletBindVm model) + { + try + { + var claimsIdentity = this.User.Identity as ClaimsIdentity; + if (claimsIdentity == null) + { + throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅"); + } + string UserId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value; + if (string.IsNullOrWhiteSpace(UserId)) + { + throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅"); + } + model.CreateUser = int.Parse(UserId); + _PdaAsnSvc.ConfirmInStock(model); + + return Ok(new { code = 0, msg = "鍏ュ簱鎴愬姛!" }); + } + catch (Exception e) + { + return Ok(new { code = 1, msg = e.Message }); + } + } + #endregion } } -- Gitblit v1.8.0