From ecab51aa2be992de333b8818df8b38405822b94b Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 20 九月 2025 16:21:06 +0800
Subject: [PATCH] 修改WMS区域管理添加功能问题

---
 Wms/Wms/Controllers/DownApiController.cs |   31 +++++++++++++++++++++++--------
 1 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/Wms/Wms/Controllers/DownApiController.cs b/Wms/Wms/Controllers/DownApiController.cs
index 1a8c847..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
                 {
@@ -347,7 +362,7 @@
                 var jsonData = JsonConvert.SerializeObject(model);
                 LogFile.SaveLogToFile($"WCS鐢宠绌烘墭璺虹粍鎵樺叆搴擄細( {jsonData} ),", logStr);
 
-                var list = _http.RequestPalletIn(model.PalletNo, model.HouseNo, model.palletNum,model.locate);
+                var list = _http.RequestPalletIn(model.PalletNo, model.HouseNo, model.PallNum,model.locate);
 
                 LogFile.SaveLogToFile($"WCS鐢宠绌烘墭璺虹粍鎵樺叆搴撹繑鍥烇細( {JsonConvert.SerializeObject(list)} ),", logStr);
 

--
Gitblit v1.8.0