From 98e221d6dc26183efab868ee5f11a65d5791304e Mon Sep 17 00:00:00 2001
From: test <15284381150@163.com>
Date: 星期五, 19 九月 2025 08:02:20 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS

---
 Wms/Wms/Controllers/PdaSoController.cs |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/Wms/Wms/Controllers/PdaSoController.cs b/Wms/Wms/Controllers/PdaSoController.cs
index dca3e5d..037cc83 100644
--- a/Wms/Wms/Controllers/PdaSoController.cs
+++ b/Wms/Wms/Controllers/PdaSoController.cs
@@ -160,7 +160,8 @@
         [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>
@@ -326,9 +327,31 @@
         [HttpPost]
         public async Task ChejianPick(PdaSoVm model)
         {
+            if (_userManager.UserId == 0)
+            {
+                throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+            }
+
             await _pdaSoSvc.ChejianPick(model.PalletNo, model.BoxNo, _userManager.UserId);
         }
 
+        /// <summary>
+        /// 杞﹂棿Pda鍑哄簱-鏁伴噺
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        /// <exception cref="Exception"></exception>
+        [HttpPost]
+        public async Task ChejianPickNum(PdaSoVm model) 
+        {
+            if (_userManager.UserId == 0)
+            {
+                throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+            }
+
+            await _pdaSoSvc.ChejianPickNum(model, _userManager.UserId);
+        }
+
         #endregion
 
         #region JC23鐗堝彇鏍�

--
Gitblit v1.8.0