From 8c6e292c508312eca0aef4c203e5857c4fc3094c Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期六, 07 九月 2024 09:18:39 +0800
Subject: [PATCH] Merge branch 'master' into Liudl
---
Wms/WMS.IBLL/IPdaServer/IPdaSoServer.cs | 48 ++++++++++++++++++++++++++++++++----------------
1 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/Wms/WMS.IBLL/IPdaServer/IPdaSoServer.cs b/Wms/WMS.IBLL/IPdaServer/IPdaSoServer.cs
index 39cad2a..d0d59f4 100644
--- a/Wms/WMS.IBLL/IPdaServer/IPdaSoServer.cs
+++ b/Wms/WMS.IBLL/IPdaServer/IPdaSoServer.cs
@@ -26,6 +26,13 @@
Task<List<string>> GetRunSoNoticeList(string palletNo, string type);
/// <summary>
+ /// 鑾峰彇鎵ц涓殑鍑哄簱鍗�
+ /// </summary>
+ /// <param name="type">绫诲瀷 鍖哄垎鏄惁鏄钩搴撳嚭搴撹幏鍙栧崟鎹�</param>
+ /// <returns></returns>
+ Task<List<string>> GetRunNoticeList(string type);
+
+ /// <summary>
/// 鑾峰彇鍑哄簱鎵樼洏涓婄殑鐗╂枡鎵规(鏍规嵁鎵樼洏鐮�)
/// </summary>
/// <param name="palletNo">鎵樼洏鐮�</param>
@@ -76,7 +83,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鎷ｈ揣
@@ -86,7 +93,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>
/// 涓嬪彂绌烘墭鍑哄簱
@@ -95,7 +102,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>
@@ -104,7 +111,16 @@
/// <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>
+ /// 鑾峰彇骞冲簱鎵樼洏浣嶇疆淇℃伅
+ /// </summary>
+ /// <param name="soNo">鍑哄簱鍗曞彿</param>
+ /// <param name="SkuNo">鐗╂枡缂栫爜</param>
+ /// <param name="LotNo">鎵规</param>
+ /// <returns></returns>
+ Task<List<BoxInfo>> GetPingKuLocationInfo(string soNo,string SkuNo,string LotNo);
/// <summary>
/// 骞冲簱鍑哄簱瀹屾垚
@@ -114,21 +130,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>
/// 鍙栨牱鍑哄簱鎷ｈ揣(鏍囩)
@@ -142,7 +158,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);
@@ -157,7 +173,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>
@@ -167,7 +183,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>
@@ -178,7 +194,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);
@@ -189,18 +205,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>
/// 鍙栨牱鍑哄簱鎷ｈ揣(鏍囩)
@@ -211,7 +227,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>
/// 鍙栨牱鍑哄簱鎷ｈ揣(鏁伴噺)
@@ -220,7 +236,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