From 7c274192786484237d4260aa2590cbbb6a64a95d Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 19 十二月 2025 11:42:29 +0800
Subject: [PATCH] 修改成品拣货逻辑
---
Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs b/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs
index d3f1f72..4f3b556 100644
--- a/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs
+++ b/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs
@@ -25,7 +25,7 @@
/// <param name="url">涓婁紶璺緞</param>
/// <param name="userId">鎿嶄綔浜�</param>
/// <returns></returns>
- bool FinishSo(int id, string url, int userId);
+ bool FinishSo(int id, string url, string url2, int userId);
/// <summary>
/// 鎺ュ彈鐢熶骇鍙枡淇″彿鎺ュ彛
/// </summary>
@@ -64,7 +64,7 @@
/// <param name="model">妯″瀷</param>
/// <param name="userId">鎿嶄綔浜�</param>
/// <returns></returns>
- bool AddExportNotice(AddEditExportNoticeVm model,int userId);
+ bool AddExportNotice(AddEditExportNoticeVm model, int userId);
/// <summary>
/// 鑾峰彇缂栬緫鍑哄簱鍗曟嵁
/// </summary>
@@ -84,16 +84,20 @@
/// <param name="id">鍑哄簱鍗旾d</param>
/// <param name="userId">鎿嶄綔浜�</param>
/// <returns></returns>
- bool DelExportNotice(int id,int userId);
+ bool DelExportNotice(int id, int userId);
/// <summary>
/// 鍗曟嵁鍏抽棴锛堝叧鍗曪級
/// </summary>
/// <param name="id">鍑哄簱鍗旾d</param>
/// <param name="userId">鎿嶄綔浜�</param>
/// <returns></returns>
- bool CloseExportNotice(int id,int userId);
+ bool CloseExportNotice(int id, int userId);
XmlNode AddExXmlStr(int id, int userId);
+
+ //鎵归噺鐢熸垚xml
+ List<ExportXmlDto> AddExportXmls(string id, int userId);
+
//------------------------------------------------------------------------------------------
@@ -122,6 +126,18 @@
/// <param name="str">鎻愮ず娑堟伅</param>
/// <returns></returns>
List<OutCommandDto> IssuePalletNoOut(string palletNo, string outMode, int userId, string url, out string str);
+
+ /// <summary>
+ /// 鎵樼洏鍑哄簱锛堝瘑闆嗗簱锛�
+ /// </summary>
+ /// <param name="palletNo"></param>
+ /// <param name="outMode"></param>
+ /// <param name="userId"></param>
+ /// <param name="url"></param>
+ /// <param name="str"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ List<OutCommandDto> IssuePalletNoOutMk(string palletNo, string outMode, int userId, string url, out string str);
//------------------------------------------------------------------------------------------
#region 澶囨枡
@@ -155,13 +171,15 @@
#endregion
//------------------------------------------------------------------------------------------
-
+
/// <summary>
/// 鑾峰彇鍑哄簱鍗曠殑浠撳簱淇℃伅
/// </summary>
/// <param name="soNo">鍑哄簱鍗曞彿</param>
/// <returns>鍑哄簱鍗曠殑浠撳簱鍙�</returns>
string GetHouseBySo(string soNo);
+
+ string GetHouseByPalletNo(string palletNo);
/// <summary>
/// 涓嬪彂鍑哄簱 绔嬪簱
@@ -193,7 +211,7 @@
/// <param name="url">涓嬪彂鍑哄簱璺緞</param>
/// <param name="str">鎻愮ず淇℃伅</param>
/// <returns>涓嬪彂鐨勬寚浠ら泦鍚�</returns>
- List<OutCommandDto> IssueOutHouse(string soNo, string unstackingMode, string outMode, string loadingAddre, int userId,string url,out string str);
+ List<OutCommandDto> IssueOutHouse(string soNo, string unstackingMode, string outMode, string loadingAddre, int userId, string url, out string str);
/// <summary>
/// wcs杩斿洖鐨勬垚鍔熶俊鍙锋垨鎵嬪姩瀹屾垚锛堝嚭搴撴垚鍔燂級
@@ -201,7 +219,7 @@
/// <param name="taskNo">浠诲姟鍙�</param>
/// <param name="userId">鎿嶄綔浜�</param>
/// <returns></returns>
- void ExportSuccess(string taskNo,int userId);
+ void ExportSuccess(string taskNo, int userId);
/// <summary>
/// wcs杩斿洖鐨勬垚鍔熶俊鍙锋垨鎵嬪姩瀹屾垚锛堢Щ搴撴垚鍔燂級
@@ -224,7 +242,7 @@
/// <param name="userId">鎿嶄綔浜�</param>
/// <param name="url">涓嬪彂璺緞</param>
/// <returns></returns>
- OutCommandDto AgainSendSoTask(string taskNo, int userId,string url);
+ OutCommandDto AgainSendSoTask(string taskNo, int userId, string url);
/// <summary>
/// 鎵嬪姩鍙栨秷鍑哄簱浠诲姟
/// </summary>
@@ -241,7 +259,7 @@
bool EmptyException(ReceiveWcsSignal model);
//------------------------------------------------------------------------------------------
-
+
/// <summary>
/// 鍒ゆ柇鏄惁璺ㄦ壒鍒嗛厤
/// </summary>
@@ -282,7 +300,7 @@
/// <param name="msg">鐗╂枡缂栫爜銆佸悕绉般�佹壒娆″彿</param>
/// <param name="palletNo">鎵樼洏鐮�</param>
/// <returns></returns>
- List<StockDetailDto> GetHandOutList(int detailId, string houseNo, string roadwayNo, string locateNo, string msg,string palletNo);
+ List<StockDetailDto> GetHandOutList(int detailId, string houseNo, string roadwayNo, string locateNo, string msg, string palletNo);
/// <summary>
/// 鎵嬪姩鍒嗛厤鍑哄簱鍗曟槑缁�
--
Gitblit v1.8.0