From 033a71417afc9f27a8794b13e94cc39cc41a8360 Mon Sep 17 00:00:00 2001 From: Administrator <Administrator@DESKTOP-5BIMHQ3> Date: 星期五, 01 三月 2024 16:16:39 +0800 Subject: [PATCH] 出库修改 --- Wms/Wms/Controllers/BllSoController.cs | 45 +++++++++++++++++++++++++++++++++------------ 1 files changed, 33 insertions(+), 12 deletions(-) diff --git a/Wms/Wms/Controllers/BllSoController.cs b/Wms/Wms/Controllers/BllSoController.cs index 56f7128..cfe804a 100644 --- a/Wms/Wms/Controllers/BllSoController.cs +++ b/Wms/Wms/Controllers/BllSoController.cs @@ -213,18 +213,18 @@ { 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 = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" }); - //} - var bolls = _exNoticeSvc.AddExXmlStr(model.Id, 1);//int.Parse(userId) + //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩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 = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" }); + } + var bolls = _exNoticeSvc.AddExXmlStr(model.Id, int.Parse(userId)); return Ok(new { code = 0, count = 0, msg = "鐢熸垚鍑哄簱鍗昘ml", data= bolls.InnerXml.ToString() }); @@ -767,5 +767,26 @@ } #endregion + + /// <summary> + /// 鍒ゆ柇鍑哄簱鏄惁闇�瑕佹媶绠� + /// </summary> + /// <param name="soNo"></param> + /// <returns></returns> + [HttpGet] + public IActionResult IsNeedUnpack(string soNo) + { + try + { + string result = _exNoticeSvc.IsNeedUnpack(soNo); + + return Ok(new { code = 0, data = result, msg = "鎴愬姛" }); + + } + catch (Exception e) + { + return Ok(new { code = 1, msg = e.Message }); + } + } } } -- Gitblit v1.8.0