From 1310b47a24f0cc70f0128c820bd490dca6a1a921 Mon Sep 17 00:00:00 2001
From: yyk <2336760928@qq.com>
Date: 星期四, 22 八月 2024 14:08:03 +0800
Subject: [PATCH] Merge branch 'master' into yyk

---
 Wms/WMS.IBLL/IPdaServer/IPdaCrServer.cs |   41 ++++++++++++++++++++++++++---------------
 1 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/Wms/WMS.IBLL/IPdaServer/IPdaCrServer.cs b/Wms/WMS.IBLL/IPdaServer/IPdaCrServer.cs
index 572ea51..2a0e958 100644
--- a/Wms/WMS.IBLL/IPdaServer/IPdaCrServer.cs
+++ b/Wms/WMS.IBLL/IPdaServer/IPdaCrServer.cs
@@ -1,6 +1,7 @@
 锘縰sing System;
 using System.Collections.Generic;
 using System.Text;
+using System.Threading.Tasks;
 using Model.ModelDto.BllCheckDto;
 using Model.ModelDto.PdaDto;
 using WMS.Entity.DataEntity;
@@ -17,7 +18,7 @@
         /// </summary>
         /// <param name="palletNo">鎵樼洏鐮�</param>
         /// <returns></returns>
-        List<string> GetStockCheckNoList(string palletNo);
+        Task<List<string>> GetStockCheckNoList(string palletNo);
 
         /// <summary>
         /// 鑾峰彇鐩樼偣鏄庣粏
@@ -25,7 +26,7 @@
         /// <param name="crNo">鍗曟嵁鍙�</param>
         /// <param name="palletNo">鎵樼洏鍙�</param>
         /// <returns></returns>
-        List<StockCheckDetailDto> GetStockCheckDetailList(string crNo,string palletNo);
+        Task<List<StockCheckDetailDto>> GetStockCheckDetailList(string crNo,string palletNo);
 
         /// <summary>
         /// 鑾峰彇瑕佺洏鐐圭殑绠辩爜淇℃伅锛堢洏鐐硅褰曚腑鏁版嵁锛�
@@ -36,7 +37,7 @@
         /// <param name="boxNo">绠辩爜鍙�</param>
         /// <param name="isContinue">鏄惁鏁伴噺鐩樼偣</param>
         /// <returns></returns>
-        List<StockCheckLogDto> GetStockCheckLogList(string crNo, string crDetail,string palletNo,string boxNo,string isContinue);
+        Task<List<StockCheckLogDto>> GetStockCheckLogList(string crNo, string crDetail,string palletNo,string boxNo,string isContinue);
 
         /// <summary>
         /// 鐩樼偣搴撳瓨
@@ -50,7 +51,7 @@
         /// <param name="qty">鏁伴噺</param>
         /// <param name="isContinue">鏄惁鏁伴噺鐩樼偣</param>
         /// <param name="userId"></param>
-        void CrSetCheck(string crNo, string crDetail, string palletNo, string boxNo,string boxNo3,string result, decimal? qty,string isContinue, int userId);
+        Task CrSetCheck(string crNo, string crDetail, string palletNo, string boxNo,string boxNo3,string result, decimal? qty,string isContinue, int userId);
 
         #endregion
 
@@ -62,7 +63,7 @@
         /// <param name="locatNo">鍌ㄤ綅缂栧彿</param>
         /// <param name="palletNo">鎵樼洏鍙�</param> 
         /// <returns></returns>
-        List<DataStockDetail> GetStockQueryList(string locatNo, string palletNo);
+        Task<List<DataStockDetail>> GetStockQueryList(string locatNo, string palletNo);
 
         #endregion
 
@@ -73,14 +74,14 @@
         /// </summary>
         /// <param name="palletNo">鍘熸墭鐩�</param>
         /// <returns></returns>
-        List<PdaPalletNoCheckDto> GetDataDetailList(string palletNo);
+        Task<List<PdaPalletNoCheckDto>> GetDataDetailList(string palletNo);
 
         /// <summary>
         /// 鏍规嵁绠辩爜鑾峰彇鐗╂枡銆佹壒娆°�佹暟閲忕瓑淇℃伅
         /// </summary>
         /// <param name="boxNo">绠辩爜</param>
         /// <returns></returns>
-        PdaPalletNoCheckDto GetBoxInfoByBox(string boxNo);
+        Task<PdaPalletNoCheckDto> GetBoxInfoByBox(string boxNo);
 
         /// <summary>
         /// 瑙ｇ粦鍘熸墭鐩樼粦瀹氭柊鎵樼洏
@@ -89,7 +90,7 @@
         /// <param name="boxNo">绠辩爜</param>
         /// <param name="palletNoNew">鏂版墭鐩�</param>
         /// <param name="userId">鎿嶄綔浜�</param>
-        void SaveUnbind(string palletNo, string boxNo, string palletNoNew, int userId);
+        Task SaveUnbind(string palletNo, string boxNo, string palletNoNew, int userId);
 
         #endregion
 
@@ -99,37 +100,37 @@
         /// </summary>
         /// <param name="palletNo"></param>
         /// <returns></returns>
-        string GetPalletLocatNo(string palletNo);
+        Task<string> GetPalletLocatNo(string palletNo);
         /// <summary>
         /// 鑾峰彇鎵樼洏鎵�鍦ㄦゼ灞傛墍鏈夊尯鍩�
         /// </summary>
         /// <param name="palletNo"></param>
         /// <returns></returns>
-        List<SysStorageArea> GetStorageArea(string palletNo);
+        Task<List<SysStorageArea>> GetStorageArea(string palletNo);
         /// <summary>
         /// 鑾峰彇宸插垎閰嶇殑鍑哄簱鍗曟嵁
         /// </summary>
         /// <returns></returns>
-        List<string> GetRunSoNoticeList();
+        Task<List<string>> GetRunSoNoticeList();
         /// <summary>
         /// 鏍规嵁鎵樼洏鍙疯幏鍙栨墭鐩樹笂鐗╂枡淇℃伅
         /// </summary>
         /// <param name="palletNo"></param>
         /// <returns></returns>
-        List<DataStockDetail> GetSkuInfoByPalletNo(string palletNo);
+        Task<List<DataStockDetail>> GetSkuInfoByPalletNo(string palletNo);
         /// <summary>
         /// 鏍规嵁鍑哄簱鍗曞彿鑾峰彇鍒嗛厤鐨勬墭鐩樹俊鎭�
         /// </summary>
         /// <param name="soNo"></param>
         /// <returns></returns>
-        List<string> GetPalletNoListBySoNo(string soNo);
+        Task<List<string>> GetPalletNoListBySoNo(string soNo);
         /// <summary>
         /// agv杞繍鍛煎彨灏忚溅
         /// </summary>
         /// <param name="palletNo"></param>
         /// <param name="areaNo"></param>
         /// <param name="ruku"></param>
-        void AgvTransport(string palletNo, string areaNo, string ruku, int userId);
+        Task AgvTransport(string palletNo, string areaNo, string ruku, int userId);
         /// <summary>
         ///  agv杞繍鍛煎彨灏忚溅鍙栬揣
         /// </summary>
@@ -137,7 +138,17 @@
         /// <param name="palletNo"></param>
         /// <param name="areaNo"></param>
         /// <param name="userId"></param>
-        void AgvTransport2(string soNo, string palletNo, string areaNo, int userId);
+        Task AgvTransport2(string soNo, string palletNo, string areaNo, int userId);
+        #endregion
+
+        #region 闆舵墭瑙ｇ粦
+        /// <summary>
+        /// 闆舵墭瑙ｇ粦
+        /// </summary>
+        /// <param name="palletNo"></param>
+        /// <param name="boxNo"></param>
+        /// <param name="userId"></param>
+        public void LingxingUnbind(string palletNo, string boxNo, int userId);
         #endregion
     }
 }

--
Gitblit v1.8.0