From 1c2541b283ce6ba855e67c476412dffe2c693480 Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期三, 11 六月 2025 13:56:23 +0800
Subject: [PATCH] Merge branch 'csc'

---
 Wms/Wms/Controllers/PdaSoController.cs |   70 ++++++++++++++++++++++++++++++++++-
 1 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/Wms/Wms/Controllers/PdaSoController.cs b/Wms/Wms/Controllers/PdaSoController.cs
index a20295f..dca3e5d 100644
--- a/Wms/Wms/Controllers/PdaSoController.cs
+++ b/Wms/Wms/Controllers/PdaSoController.cs
@@ -13,6 +13,7 @@
 using Wms.Tools;
 using Utility;
 using System.Security.Cryptography;
+using Model.InterFaceModel;
 
 namespace Wms.Controllers
 {
@@ -75,10 +76,35 @@
         /// <param name="model">PalletNo:鎵樼洏鐮併�丼oNo:鍗曟嵁鍙�</param> 
         /// <returns></returns>
         [HttpPost]
+        public async Task<List<DetailIdSkuLotNo>> GetSoSkuLotNoListBySo(PdaSoVm model)
+        {
+            return await _pdaSoSvc.GetSoSkuLotNoListBySo(model.SoNo);
+        }
+
+
+        /// <summary>
+        /// 鑾峰彇鐗╂枡-鎵规淇℃伅
+        /// </summary>
+        /// <param name="model">PalletNo:鎵樼洏鐮併�丼oNo:鍗曟嵁鍙�</param> 
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<List<string>> GetPalletListBySo(PdaSoVm model)
+        {
+            return await _pdaSoSvc.GetPalletListBySo(model.SoNo,model.SoDetailId);
+        }
+
+
+        /// <summary>
+        /// 鑾峰彇鐗╂枡-鎵规淇℃伅
+        /// </summary>
+        /// <param name="model">PalletNo:鎵樼洏鐮併�丼oNo:鍗曟嵁鍙�</param> 
+        /// <returns></returns>
+        [HttpPost]
         public async Task<List<DetailIdSkuLotNo>> GetSoSkuLotNoListByPallet(PdaSoVm model)
         {
            return await _pdaSoSvc.GetSoSkuLotNoListByPallet(model.PalletNo, model.SoNo);
         }
+
 
         /// <summary>
         /// 鑾峰彇鍑哄簱鍙ｃ�佽鏍笺�佸緟鎷ｅ強宸叉嫞鏁伴噺锛堟牴鎹嚭搴撳崟鏄庣粏ID銆佹墭鐩樺彿锛�
@@ -148,6 +174,25 @@
             await _pdaSoSvc.SoSetQtyPick(model.SoNo, model.SoDetailId, model.PalletNo, model.PickQty, _userManager.UserId);
         }
 
+        /// <summary>
+        /// 鏍规嵁绠辩爜鑾峰彇鏍囩绠辩爜淇℃伅锛堣溅闂村叆搴�-鑾峰彇WMS鐢熸垚鐨勭淇℃伅锛�
+        /// </summary>
+        /// <param name="boxNo">BoxNo:绠卞彿</param>
+        /// <returns></returns>
+        [HttpGet]
+        public IActionResult GetWmsBoxInfos(string boxNo)
+        {
+            try
+            {
+                var models = _pdaSoSvc.GetWmsBoxInfos(boxNo);
+
+                return Ok(new { code = 0, msg = "鏍囩绠辩爜淇℃伅", data = models });
+            }
+            catch (Exception e)
+            {
+                return Ok(new { code = 1, msg = e.Message });
+            }
+        }
 
         /// <summary>
         /// 绌烘墭鍑哄簱
@@ -155,9 +200,18 @@
         /// <param name="model">绌烘墭鐩樺嚭搴�</param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<string> IssuePlnOutHouse(OutModePalletVm model)
+        public async Task<IActionResult> IssuePlnOutHouse(OutModePalletVm model)
         {
-            return await _pdaSoSvc.IssuePlnOutHouse(model, _userManager.UserId, _config.WcsHost + _config.IssueComApiUrl);
+            try
+            {
+                await _pdaSoSvc.IssuePlnOutHouse(model, _userManager.UserId, _config.WcsHost + _config.IssueComApiUrl);
+                return Ok(new HttpReturnModel { Success = "0", Message = "涓嬪彂璇锋眰鎴愬姛" });
+            }
+            catch (Exception e)
+            {
+                return Ok(new HttpReturnModel { Success = "1", Message = e.Message });
+            }
+            
         }
 
 
@@ -263,6 +317,18 @@
         {
             await _pdaSoSvc.SoSetQtyPinPick34(model.SoNo, model.SoDetailId, model.PalletNo, model.PickQty, model.PalletNoNew, _userManager.UserId);
         }
+
+        /// <summary>
+        /// 杞﹂棿pda鎷ｈ揣-鏍囩
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task ChejianPick(PdaSoVm model)
+        {
+            await _pdaSoSvc.ChejianPick(model.PalletNo, model.BoxNo, _userManager.UserId);
+        }
+
         #endregion
 
         #region JC23鐗堝彇鏍�

--
Gitblit v1.8.0