From c5dc821692c0529e3a688af84c647bf80cc49360 Mon Sep 17 00:00:00 2001
From: test <15284381150@163.com>
Date: 星期日, 21 九月 2025 10:49:40 +0800
Subject: [PATCH] Merge branch 'master' into djp

---
 Wms/WMS.IBLL/IPdaServer/IPdaSoServer.cs |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/Wms/WMS.IBLL/IPdaServer/IPdaSoServer.cs b/Wms/WMS.IBLL/IPdaServer/IPdaSoServer.cs
index 486d8e6..c4f6de7 100644
--- a/Wms/WMS.IBLL/IPdaServer/IPdaSoServer.cs
+++ b/Wms/WMS.IBLL/IPdaServer/IPdaSoServer.cs
@@ -122,7 +122,14 @@
         /// <param name="boxNo3">鏀�/琚嬬爜</param>
         /// <returns></returns>
         Task<List<BoxInfo>> GetDataComBoxInfo(string soDetailId, string palletNo, string boxNo, string boxNo3);
-
+        /// <summary>
+        /// 鍑哄簱鎷h揣鑾峰彇鎵弿鏍囩鏁伴噺
+        /// </summary>
+        /// <param name="palletNo"></param>
+        /// <param name="boxNo"></param>
+        /// <returns></returns>
+        /// <exception cref="Exception"></exception>
+        decimal CheckBoxForPick(string palletNo, string boxNo);
         /// <summary>
         /// 鑾峰彇搴撳唴鏃犵鐮佺殑鎵樼洏鍒嗛厤淇℃伅
         /// </summary>
@@ -142,6 +149,18 @@
         /// <param name="boxNo3">鏀�/琚嬬爜</param>
         /// <param name="userId">鎿嶄綔浜�</param>
         Task SoSetPick(string soNo, string soDetailId, string palletNo, string boxNo, string boxNo3, string PickQty, int userId);
+        /// <summary>
+        /// 鍑哄簱pda鎷h揣-JC34
+        /// </summary>
+        /// <param name="soNo"></param>
+        /// <param name="soDetailId"></param>
+        /// <param name="palletNo"></param>
+        /// <param name="boxNo">绠辩爜/鐩掔爜/鏀爜</param>
+        /// <param name="pickQty1"></param>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        /// <exception cref="Exception"></exception>
+        Task SoSetPick34(string soNo, string soDetailId, string palletNo, string boxNo, string pickQty1, int userId);
 
         /// <summary>
         /// 鍑哄簱pda鎷h揣

--
Gitblit v1.8.0