From 156e0d593769d1c4438eb1c6d4547063f76331b3 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 19 十一月 2025 15:52:31 +0800
Subject: [PATCH] 修改拣货拼托bug

---
 Wms/Wms/Controllers/PdaSoController.cs |   44 ++++++++++++++++++++++++++++++++++++++------
 1 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/Wms/Wms/Controllers/PdaSoController.cs b/Wms/Wms/Controllers/PdaSoController.cs
index 77e01ba..201f2a4 100644
--- a/Wms/Wms/Controllers/PdaSoController.cs
+++ b/Wms/Wms/Controllers/PdaSoController.cs
@@ -90,7 +90,7 @@
         [HttpPost]
         public async Task<List<string>> GetPalletListBySo(PdaSoVm model)
         {
-            return await _pdaSoSvc.GetPalletListBySo(model.SoNo,model.SoDetailId);
+            return await _pdaSoSvc.GetPalletListBySo(model.SoNo, model.SoDetailId);
         }
 
 
@@ -102,7 +102,7 @@
         [HttpPost]
         public async Task<List<DetailIdSkuLotNo>> GetSoSkuLotNoListByPallet(PdaSoVm model)
         {
-           return await _pdaSoSvc.GetSoSkuLotNoListByPallet(model.PalletNo, model.SoNo);
+            return await _pdaSoSvc.GetSoSkuLotNoListByPallet(model.PalletNo, model.SoNo);
         }
 
 
@@ -153,6 +153,27 @@
         }
 
         /// <summary>
+        /// 鍑哄簱鎷h揣鑾峰彇鎵弿鏍囩鏁伴噺
+        /// </summary>
+        /// <param name="palletNo"></param>
+        /// <param name="boxNo"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public IActionResult CheckBoxForPick(string palletNo, string boxNo)
+        {
+            try
+            {
+                var boxNum = _pdaSoSvc.CheckBoxForPick(palletNo, boxNo);
+
+                return Ok(new { code = 0, msg = "鎷h揣鏄庣粏淇℃伅", data = boxNum });
+            }
+            catch (Exception e)
+            {
+                return Ok(new { code = 1, msg = e.Message });
+            }
+        }
+
+        /// <summary>
         /// 鍑哄簱pda鎷h揣
         /// </summary>
         /// <param name="model">SoDetailId:鍑哄簱鍗曟槑缁咺D銆丳alletNo:鎵樼洏鐮�</param> 
@@ -160,7 +181,18 @@
         [HttpPost]
         public async Task SoSetPick(PdaSoVm model)
         {
-            await _pdaSoSvc.SoSetPick(model.SoNo, model.SoDetailId, model.PalletNo, model.BoxNo, model.BoxNo3, model.PickQty, _userManager.UserId);
+            //await _pdaSoSvc.SoSetPick(model.SoNo, model.SoDetailId, model.PalletNo, model.BoxNo, model.BoxNo3, model.PickQty, _userManager.UserId);
+            await _pdaSoSvc.SoSetPick34(model.SoNo, model.SoDetailId, model.PalletNo, model.BoxNo, model.PickQty, _userManager.UserId);
+        }
+        /// <summary>
+        /// 鎴愬搧鍑哄簱pda鎷h揣-JC34
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task SoSetPickCode(PdaSoVm model)
+        {
+            await _pdaSoSvc.SoSetPickCode34(model.SoNo, model.SoDetailId, model.PalletNo, model.BoxNoList, _userManager.UserId);
         }
 
         /// <summary>
@@ -211,7 +243,7 @@
             {
                 return Ok(new HttpReturnModel { Success = "1", Message = e.Message });
             }
-            
+
         }
 
 
@@ -236,7 +268,7 @@
         ///  <param name="LotNo">鎵规</param>
         /// <returns></returns>
         [HttpGet]
-        public async Task<List<BoxInfo>> GetPingKuLocationInfo(string soNo,string SkuNo,string LotNo)
+        public async Task<List<BoxInfo>> GetPingKuLocationInfo(string soNo, string SkuNo, string LotNo)
         {
             return await _pdaSoSvc.GetPingKuLocationInfo(soNo, SkuNo, LotNo);
         }
@@ -341,7 +373,7 @@
         /// <returns></returns>
         /// <exception cref="Exception"></exception>
         [HttpPost]
-        public async Task ChejianPickNum(PdaSoVm model) 
+        public async Task ChejianPickNum(PdaSoVm model)
         {
             if (_userManager.UserId == 0)
             {

--
Gitblit v1.8.0