From b5f1dc9b984bcc449aac349a8760cd4c4d83beae Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期五, 26 七月 2024 10:04:12 +0800
Subject: [PATCH] Merge branch 'hwh'

---
 Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs b/Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs
index a032bf4..bbb4008 100644
--- a/Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs
+++ b/Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs
@@ -51,7 +51,21 @@
         void BindPalletByJc23(PdaPalletBindVm model, int userId, string origin);
 
         //JC23缁戝畾鐗╂枡鎵樼洏鍗冲鍔犲簱瀛�
-        public void BindPalletStock(PdaPalletBindVm model, int userId, string origin);
+        void BindPalletStock(PdaPalletBindVm model, int userId, string origin);
+
+        ///// <summary>
+        ///// JC26缁戝畾鎵樼洏 璐存爣鐗╂枡
+        ///// </summary>
+        ///// <param name="model"></param>
+        ///// <param name="userId"></param>
+        //void BindPalletPasteCode(PdaPalletBindVm model, int userId);
+
+        /// <summary>
+        /// JC26缁戝畾鎵樼洏 涓嶈创鏍囩墿鏂�
+        /// </summary>
+        /// <param name="model"></param>
+        /// <param name="userId"></param>
+        void BindPalletNoPasteCode(PdaPalletBindVm model, int userId);
 
         // 缁戝畾绌烘墭鐩�
         string BindNullPallet(PalletBindVm model);

--
Gitblit v1.8.0