From e1937ea7d68c72e61095538d5fec4e7d795f78c9 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期四, 16 十月 2025 10:48:18 +0800
Subject: [PATCH] 修改物料管理显示和编辑
---
Wms/Wms/Controllers/BllSoController.cs | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/Wms/Wms/Controllers/BllSoController.cs b/Wms/Wms/Controllers/BllSoController.cs
index 3e3ace5..66fcd5e 100644
--- a/Wms/Wms/Controllers/BllSoController.cs
+++ b/Wms/Wms/Controllers/BllSoController.cs
@@ -582,11 +582,11 @@
}
[HttpGet]
- public IActionResult GetCompBoxInfoList( string boxNo,string boxNo3)
+ public IActionResult GetCompBoxInfoList(string sONo, string boxNo,string boxNo3)
{
try
{
- var bolls = _comDetailSvc.GetCompBoxInfoList(boxNo, boxNo3);
+ var bolls = _comDetailSvc.GetCompBoxInfoList(sONo, boxNo, boxNo3);
return Ok(new { code = 0, count = bolls.Count, msg = "鎷ｈ揣鏄庣粏淇℃伅", data = bolls });
}
@@ -638,12 +638,21 @@
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
//楠岃瘉鍑哄簱鍙�
- //if (string.IsNullOrWhiteSpace(outMode))
- //{
- // return Ok(new { code = 1, msg = "璇烽�夋嫨鍑哄簱鍙�" });
- //}
-
- var list = _exNoticeSvc.IssuePalletNoOut(palletNo, outMode, int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl, out string str);
+ if (string.IsNullOrWhiteSpace(outMode))
+ {
+ return Ok(new { code = 1, msg = "璇烽�夋嫨鍑哄簱鍙�" });
+ }
+ string str = string.Empty;
+ var list = new List<OutCommandDto>();
+ if (outMode == "17" || outMode == "18")
+ {
+ list = _exNoticeSvc.IssuePalletNoOutMk(palletNo, outMode, int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl, out str);
+ }
+ else
+ {
+ list = _exNoticeSvc.IssuePalletNoOut(palletNo, outMode, int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl, out str);
+ }
+
return Ok(new { code = 0, msg = str, data = list });
--
Gitblit v1.8.0