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/IPdaSoServer.cs |   51 ++++++++++++++++++++++++++-------------------------
 1 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/Wms/WMS.IBLL/IPdaServer/IPdaSoServer.cs b/Wms/WMS.IBLL/IPdaServer/IPdaSoServer.cs
index 4de44c9..7d2dfe1 100644
--- a/Wms/WMS.IBLL/IPdaServer/IPdaSoServer.cs
+++ b/Wms/WMS.IBLL/IPdaServer/IPdaSoServer.cs
@@ -1,8 +1,9 @@
 锘縰sing System;
 using System.Collections.Generic;
 using System.Text;
+using System.Threading.Tasks;
 using Model.InterFaceModel;
-using Model.ModelDto; 
+using Model.ModelDto;
 using Model.ModelVm.PdaVm;
 
 namespace WMS.IBLL.IPdaServer
@@ -14,7 +15,7 @@
         /// </summary>
         /// <param name="palletNo">鎵樼洏鍙�</param>
         /// <returns>"":鍙娇鐢� -1:涓嶅彲浣跨敤锛堝師鍥�)</returns>
-        string IsEnableOkPalletNo(string palletNo);
+        Task<string> IsEnableOkPalletNo(string palletNo);
 
         /// <summary>
         /// 鑾峰彇鎵ц涓殑鍑哄簱鍗�(鏍规嵁鎵樼洏鐮�)
@@ -22,15 +23,15 @@
         /// <param name="palletNo">鎵樼洏鐮�</param>
         /// <param name="type">绫诲瀷 鍖哄垎鏄惁鏄钩搴撳嚭搴撹幏鍙栧崟鎹�</param>
         /// <returns></returns>
-        List<string> GetRunSoNoticeList(string palletNo, string type);
-        
+        Task<List<string>> GetRunSoNoticeList(string palletNo, string type);
+
         /// <summary>
         /// 鑾峰彇鍑哄簱鎵樼洏涓婄殑鐗╂枡鎵规(鏍规嵁鎵樼洏鐮�)
         /// </summary>
         /// <param name="palletNo">鎵樼洏鐮�</param>
         /// <param name="soNo">鍗曟嵁鍙�</param>
         /// <returns></returns>
-        List<DetailIdSkuLotNo> GetSoSkuLotNoListByPallet(string palletNo,string soNo);
+        Task<List<DetailIdSkuLotNo>> GetSoSkuLotNoListByPallet(string palletNo, string soNo);
 
         /// <summary>
         /// 鑾峰彇鍑哄簱鍙ｃ�佽鏍笺�佸緟鎷ｅ強宸叉嫞鏁伴噺锛堟牴鎹嚭搴撳崟鏄庣粏ID銆佹墭鐩樺彿锛�
@@ -38,14 +39,14 @@
         /// <param name="soDetailId">鍑哄簱鍗曟槑缁咺D</param>
         /// <param name="palletNo">鎵樼洏鍙�</param>
         /// <returns></returns>
-        OutPdaInfo GetOutlets(string soDetailId, string palletNo);
+        Task<OutPdaInfo> GetOutlets(string soDetailId, string palletNo);
 
         /// <summary>
         /// 鑾峰彇鍑哄簱鍗曠殑璁″垝鏁伴噺鍜屽畬鎴�
         /// </summary>
         /// <param name="soDetailId">鍑哄簱鍗曟槑缁咺D</param>
         /// <returns></returns>
-        OutPdaInfo GetPlanAndFinishQty(string soDetailId);
+        Task<OutPdaInfo> GetPlanAndFinishQty(string soDetailId);
 
         /// <summary>
         /// 鑾峰彇绠辩爜淇℃伅锛堟牴鎹鐮佸湪搴撳瓨绠辩爜鏄庣粏涓煡璇級
@@ -55,7 +56,7 @@
         /// <param name="boxNo">绠辩爜</param>
         /// <param name="boxNo3">鏀�/琚嬬爜</param>
         /// <returns></returns>
-        List<BoxInfo> GetDataComBoxInfo(string soDetailId,string palletNo, string boxNo, string boxNo3);
+        Task<List<BoxInfo>> GetDataComBoxInfo(string soDetailId, string palletNo, string boxNo, string boxNo3);
 
         /// <summary>
         /// 鑾峰彇搴撳唴鏃犵鐮佺殑鎵樼洏鍒嗛厤淇℃伅
@@ -63,7 +64,7 @@
         /// <param name="soDetailId">鍑哄簱鍗曟槑缁咺D</param>
         /// <param name="palletNo">鎵樼洏鍙�</param>
         /// <returns></returns>
-        List<BoxInfo> GetAllotPlnInfo(string soDetailId,string palletNo);
+        Task<List<BoxInfo>> GetAllotPlnInfo(string soDetailId, string palletNo);
 
         /// <summary>
         /// 鍑哄簱pda鎷ｈ揣
@@ -75,7 +76,7 @@
         /// <param name="boxNo2">鐩掔爜</param>
         /// <param name="boxNo3">鏀�/琚嬬爜</param>
         /// <param name="userId">鎿嶄綔浜�</param>
-        void SoSetPick(string soNo, string soDetailId, string palletNo, string boxNo, string boxNo3, string PickQty, int userId);
+        Task SoSetPick(string soNo, string soDetailId, string palletNo, string boxNo, string boxNo3, string PickQty, int userId);
 
         /// <summary>
         /// 鍑哄簱pda鎷ｈ揣
@@ -85,7 +86,7 @@
         /// <param name="palletNo">鎵樼洏鍙�</param> 
         /// <param name="PickQty">鎷ｈ揣鏁伴噺</param>
         /// <param name="userId">鎿嶄綔浜�</param>
-        void SoSetQtyPick(string soNo, string soDetailId, string palletNo, string PickQty, int userId);
+        Task SoSetQtyPick(string soNo, string soDetailId, string palletNo, string PickQty, int userId);
 
         /// <summary>
         /// 涓嬪彂绌烘墭鍑哄簱
@@ -94,7 +95,7 @@
         /// <param name="userId">鍑哄簱鍙�</param>
         /// <param name="url">涓嬪彂璺緞</param>
         /// <returns></returns>
-        string IssuePlnOutHouse(OutModePalletVm model, int userId,string url);
+        Task<string> IssuePlnOutHouse(OutModePalletVm model, int userId, string url);
 
 
         /// <summary>
@@ -103,7 +104,7 @@
         /// <param name="soNo">鍑哄簱鍗曞彿</param>
         /// <param name="palletNo">鎵樼洏鍙�</param>
         /// <returns></returns>
-        List<BoxInfo> GetPingKuInfoByPallet(string soNo, string palletNo);
+        Task<List<BoxInfo>> GetPingKuInfoByPallet(string soNo, string palletNo);
 
         /// <summary>
         /// 骞冲簱鍑哄簱瀹屾垚
@@ -113,21 +114,21 @@
         /// <param name="palletNo">鎵樼洏鍙�</param>
         /// <param name="userId">鎿嶄綔浜�</param>
         /// <returns></returns>
-        void PlaneExportSuccess(string soNo, string palletNo,int userId);
+        Task PlaneExportSuccess(string soNo, string palletNo, int userId);
 
         /// <summary>
         /// 鏍规嵁鎵樼洏鍙疯幏鍙栧彇鏍风被鍨� 
         /// </summary>
         /// <param name="palletNo"></param>
         /// <returns>0锛氬簱鍐呭彇鏍枫��1锛氬簱鍓嶅彇鏍�</returns>
-        string GetSampleType(string palletNo);
+        Task<string> GetSampleType(string palletNo);
 
         /// <summary>
         /// 鏍规嵁鎵樼洏鍙疯幏鍙栧叆搴撳崟鎹�(搴撳墠鍙栨牱鍑哄簱涓氬姟)
         /// </summary>
         /// <param name="palletNo">鎵樼洏鍙�</param>
         /// <returns>鍗曟嵁闆嗗悎</returns>
-        List<string> GetAsnNoByPallet(string palletNo);
+        Task<List<string>> GetAsnNoByPallet(string palletNo);
 
         /// <summary>
         /// 鍙栨牱鍑哄簱鎷ｈ揣(鏍囩)
@@ -141,7 +142,7 @@
         /// <param name="pickQty1">鎷ｈ揣鏁伴噺</param>
         /// <param name="asnNo">鍏ュ簱鍗�</param>
         /// <param name="userId">鎿嶄綔浜篒D</param>
-        void SampleSoSetPick(string soType, string soNo, string soDetailId, string palletNo, string boxNo,
+        Task SampleSoSetPick(string soType, string soNo, string soDetailId, string palletNo, string boxNo,
             string boxNo3, string pickQty1, string asnNo, int userId);
 
 
@@ -156,7 +157,7 @@
         /// <param name="boxNo3">鏀�/琚嬬爜</param>
         /// <param name="palletNo">鏂版墭鐩樺彿</param> 
         /// <param name="userId">鎿嶄綔浜�</param>
-        void SoSetPinPick(string soNo, string soDetailId, string palletNo, string boxNo, string boxNo3, string PickQty,string palletNoNew, int userId);
+        Task SoSetPinPick(string soNo, string soDetailId, string palletNo, string boxNo, string boxNo3, string PickQty, string palletNoNew, int userId);
         /// <summary>
         /// 鎷兼墭鍑哄簱pda鎷ｈ揣-鏁伴噺
         /// </summary>
@@ -166,7 +167,7 @@
         /// <param name="PickQty"></param>
         /// <param name="palletNoNew"></param>
         /// <param name="userId"></param>
-        void SoSetQtyPinPick(string soNo, string soDetailId, string palletNo, string PickQty, string palletNoNew, int userId);
+        Task SoSetQtyPinPick(string soNo, string soDetailId, string palletNo, string PickQty, string palletNoNew, int userId);
         /// <summary>
         ///  鍙栨牱鍑哄簱鎷ｈ揣(鏃犳爣绛�)
         /// </summary>
@@ -177,7 +178,7 @@
         /// <param name="PickQty">鎷ｈ揣鏁伴噺</param>
         /// <param name="asnNo">鍏ュ簱鍗�</param>
         /// <param name="userId">鎿嶄綔浜篒D</param>
-        void SampleSoSetQtyPick(string soType, string soNo, string soDetailId, string palletNo, string PickQty,
+        Task SampleSoSetQtyPick(string soType, string soNo, string soDetailId, string palletNo, string PickQty,
             string asnNo, int userId);
 
 
@@ -188,18 +189,18 @@
         /// </summary>
         /// <param name="palletNo">鎵樼洏鍙�</param>
         /// <returns>0:鏍囩鍙栨牱  1锛氭暟閲忓彇鏍�</returns>
-        string GetSampleType2(string palletNo);
+        Task<string> GetSampleType2(string palletNo);
         /// <summary>
         /// 鑾峰彇寰呭嚭搴撴垨寰呭彇鏍风殑璇烽獙鍗�
         /// </summary>
         /// <returns></returns>
-        List<string> GetInspectionNo();
+        Task<List<string>> GetInspectionNo();
         /// <summary>
         /// 鑾峰彇璇烽獙鍗曠浉鍏充俊鎭�
         /// </summary>
         /// <param name="qcNo">璇烽獙鍗�</param>
         /// <returns></returns>
-        InspectionRequestDto GetInspectionRequestInfo(string qcNo);
+        Task<InspectionRequestDto> GetInspectionRequestInfo(string qcNo);
 
         /// <summary>
         /// 鍙栨牱鍑哄簱鎷ｈ揣(鏍囩)
@@ -210,7 +211,7 @@
         /// <param name="boxNo3">鏀爜</param>
         /// <param name="pickQty">鎷ｈ揣鏁伴噺</param>
         /// <param name="userId"></param>
-        void SampleSetPick(string qcNo, string palletNo, string boxNo, string boxNo3, string pickQty, int userId);
+        Task SampleSetPick(string qcNo, string palletNo, string boxNo, string boxNo3, string pickQty, int userId);
 
         /// <summary>
         /// 鍙栨牱鍑哄簱鎷ｈ揣(鏁伴噺)
@@ -219,7 +220,7 @@
         /// <param name="palletNo">鎵樼洏鍙�</param>
         /// <param name="pickQty">鎷ｈ揣鏁伴噺</param>
         /// <param name="userId"></param>
-        void SampleSetQtyPick(string qcNo, string palletNo, string pickQty, int userId);
+        Task SampleSetQtyPick(string qcNo, string palletNo, string pickQty, int userId);
 
         #endregion
 

--
Gitblit v1.8.0