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.IBLL/IPdaServer/IPdaAsnServer.cs |   38 ++++++++++++++++++++++++++++++++++++--
 1 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs b/Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs
index e826d99..c6beb28 100644
--- a/Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs
+++ b/Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs
@@ -7,11 +7,45 @@
 using Model.ModelDto.PdaDto;
 using WMS.Entity.BllAsnEntity;
 using Model.ModelDto.DataDto;
+using Model.ModelDto.SysDto;
+using Model.ModelVm.SysVm;
 
 namespace WMS.IBLL.IPdaServer
 {
     public interface IPdaAsnServer
     {
+        #region JC34
+
+        //鑾峰彇闇�瑕佽创鏍囩鐨勫叆搴撳崟 鍗曟嵁鍙烽泦鍚�
+        List<string> GetPasteAsnNoStrList();
+        //鑾峰彇涓嶉渶瑕佽创鏍囩鐨勫叆搴撳崟 鍗曟嵁鍙烽泦鍚�
+        List<string> GetNoPasteAsnNoStrList();
+        //鏍规嵁鍗曟嵁鑾峰彇鏍囩鏁伴噺
+        BoxListInfoDto GetBoxCountByAsn(string asnNo, int? asnDetailId);
+
+        /// <summary>
+        /// 淇濆瓨鎸囧畾鐨勫偍浣�
+        /// </summary>
+        /// <param name="palletNo"></param>
+        /// <param name="locateNo"></param>
+        /// <param name="userId"></param>
+        void SaveAppointLocate(string palletNo, string locateNo, int userId);
+
+        List<BoxInfoDto> GetWmsBoxInfos(string boxNo);
+
+        void ChejianIn(string palletNo, string boxNo, decimal qty,string areaNo, int userId);
+
+        void ChejianQtyIn(string palletNo, string skuNo, string lotNo, decimal qty, string areaNo, int userId);
+
+        #endregion
+
+
+        // 鏍规嵁鐗╂枡缂栫爜銆佸悕绉拌幏鍙栫墿鏂欎俊鎭��
+        MaterialsDto GetSkuInfo(GetMaterialsVm model);
+
+        // 鐢熸垚绾胯竟搴撶鐮侊紝杩斿洖绠辩爜淇℃伅銆�
+        List<BllBoxInfo> AddLabels(LabelsVm model);
+
         // 鑾峰彇鍗曟嵁鍒楄〃
         List<ArrivalNoticeDto> GetArrivalNotices(ArrivalNoticeVm model);
 
@@ -104,7 +138,7 @@
         void CompleteInStockLing(PdaLingAsnVm model, int userId);
 
         // 鏍规嵁绠辩爜鑾峰彇鏍囩绠辩爜淇℃伅
-        List<BoxInfoDto> GetBindBoxInfos(BoxInfoVm model);
+        List<BoxInfoDto> GetBindBoxInfos(BoxInfoVm model,string url);
 
         //鏍规嵁鍗曟嵁鍙疯幏鍙栧崟鎹槑缁嗗垪琛�
         List<ArrivalNoticeDetailDto> GetBindArrivalNoticeDetails(ArrivalNoticeVm model);
@@ -113,7 +147,7 @@
         void ConfirmInStock(PalletBindVm model);
 
         //鏍规嵁绠辩爜鍚戣拷婧郴缁熻姹傜淇℃伅
-        List<BoxInfoDto> GetFMBindBoxInfos(string boxno);
+        List<BoxInfoDto> GetFMBindBoxInfos(string boxno,string url);
 
         #region JC23鍙栨牱涓氬姟鎺ュ彛
 

--
Gitblit v1.8.0