From c5ba5ced45cddbe2fb4964dddc620f8fcecce6af Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 17 九月 2025 17:54:24 +0800
Subject: [PATCH] 修改PDA组托收货功能
---
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 73a6d6d..3ef0045 100644
--- a/Wms/Wms/Controllers/BllSoController.cs
+++ b/Wms/Wms/Controllers/BllSoController.cs
@@ -76,7 +76,7 @@
{
try
{
- var bolls = _exNoticeSvc.GetStockGroupList(model.Type,model.OwnerNo,model.Msg);
+ var bolls = _exNoticeSvc.GetStockGroupList(model.WareHouseNo,model.Type,model.OwnerNo,model.Msg);
return Ok(new { code = 0, count=0, 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 });
@@ -703,7 +712,7 @@
{
try
{
- var type = new List<string>(){"1","4"};
+ var type = new List<string>(){"1"};
RefAsync<int> count = new RefAsync<int>();
var bolls = await _taskSvc.GetTaskList( type, model.Type,model.Status,model.TaskNo,model.IsSuccess,model.PalletNo,model.Msg,model.Page, model.Limit, count);
--
Gitblit v1.8.0