From 88dd0bb81e2d4e6d560e7b62bbe0a9c141c84a41 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 20 九月 2025 16:21:18 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS
---
Wms/Wms/Controllers/DownApiController.cs | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/Wms/Wms/Controllers/DownApiController.cs b/Wms/Wms/Controllers/DownApiController.cs
index 4fd62ab..8ba268b 100644
--- a/Wms/Wms/Controllers/DownApiController.cs
+++ b/Wms/Wms/Controllers/DownApiController.cs
@@ -174,23 +174,38 @@
{
return Ok(new HttpReturnModel { Success = "-1", Message = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�"});
}
- //楠岃瘉鍑哄簱鍙�
- if (string.IsNullOrWhiteSpace(outMode))
- {
- return Ok(new HttpReturnModel { Success = "-1", Message = "璇烽�夋嫨鍑哄簱鍦板潃" });
- }
+
var house = _exNoticeSvc.GetHouseBySo(soNo);
+ if (house != "W01")
+ {
+ house= _exNoticeSvc.GetHouseByPalletNo(palletNo);
+ }
if (house == "W01")
{
+ //楠岃瘉鍑哄簱鍙�
+ if (string.IsNullOrWhiteSpace(outMode))
+ {
+ return Ok(new HttpReturnModel { Success = "-1", Message = "璇烽�夋嫨鍑哄簱鍦板潃" });
+ }
//var list = _exNoticeSvc.IssueOutHouseMk(soNo, outMode, int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl, out string str);
return Ok(new HttpReturnModel { Success = "0", Message = "str", Data = "list" });
}
else if (house == "W02")
{
- var list = _http.IssueOutHouseLk(soNo,soDetailId, outMode,palletNo, int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl, out string str);
+ //楠岃瘉鍑哄簱鍙�
+ if (string.IsNullOrWhiteSpace(outMode))
+ {
+ return Ok(new HttpReturnModel { Success = "-1", Message = "璇烽�夋嫨鍑哄簱鍦板潃" });
+ }
+ var list = _http.IssueOutHouseLk(soNo, soDetailId, outMode, palletNo, int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl, out string str);
- return Ok(new HttpReturnModel { Success = "0", Message = str, Data = list});
+ return Ok(new HttpReturnModel { Success = "0", Message = str, Data = list });
+ }
+ else if (house == "W04")
+ {
+ _http.IssueOutHousePk(soNo, soDetailId, palletNo, int.Parse(userId));
+ return Ok(new HttpReturnModel { Success = "0", Message = "涓嬪彂鎴愬姛" });
}
else
{
--
Gitblit v1.8.0