From e561870f9644a5e80925346485fe623da678177f Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期二, 14 十月 2025 10:20:57 +0800
Subject: [PATCH] 调整WMS出库逻辑，原辅料可选择成品库出库；
---
Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 5 deletions(-)
diff --git a/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs b/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs
index c5939bc..c2b65d3 100644
--- a/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs
+++ b/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs
@@ -17,7 +17,7 @@
/// </summary>
/// <param name="model">妯″瀷</param>
/// <returns></returns>
- SoResInfo ErpAddExportNotice(SoInfo model);
+ SoResInfo ErpAddExportNotice(SendSoVm model);
/// <summary>
/// 鑾峰彇鎵ц瀹屾垚鐨勫崟鎹彂閫佽嚦erp
/// </summary>
@@ -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>
@@ -57,7 +57,7 @@
/// <param name="type">绫诲瀷</param>
/// <param name="msg">鐗╂祦缂栫爜銆佸悕绉般�佹壒娆�</param>
/// <returns></returns>
- List<ExStockInfoDto> GetStockGroupList( string type, string ownerNo, string msg);
+ List<ExStockInfoDto> GetStockGroupList(string house, string type, string ownerNo, string msg);
/// <summary>
/// 娣诲姞鍑哄簱鍗�
/// </summary>
@@ -123,6 +123,18 @@
/// <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,6 +167,36 @@
#endregion
//------------------------------------------------------------------------------------------
+
+ /// <summary>
+ /// 鑾峰彇鍑哄簱鍗曠殑浠撳簱淇℃伅
+ /// </summary>
+ /// <param name="soNo">鍑哄簱鍗曞彿</param>
+ /// <returns>鍑哄簱鍗曠殑浠撳簱鍙�</returns>
+ string GetHouseBySo(string soNo);
+
+ string GetHouseByPalletNo(string palletNo);
+
+ /// <summary>
+ /// 涓嬪彂鍑哄簱 绔嬪簱
+ /// </summary>
+ /// <param name="soNo">鍑哄簱鍗�</param>
+ /// <param name="outMode">鍑哄簱鍙�</param>
+ /// <param name="userId">涓嬪彂浜�</param>
+ /// <param name="url">涓嬪彂璺緞</param>
+ /// <param name="str">杩斿洖鎻愮ずString</param>
+ /// <returns>鍑哄簱闆嗗悎</returns>
+ List<OutCommandDto> IssueOutHouseLk(string soNo, string outMode, int userId, string url, out string str);
+ /// <summary>
+ /// 涓嬪彂鍑哄簱 瀵嗛泦搴�
+ /// </summary>
+ /// <param name="soNo">鍑哄簱鍗�</param>
+ /// <param name="outMode">鍑哄簱鍙�</param>
+ /// <param name="userId">涓嬪彂浜�</param>
+ /// <param name="url">涓嬪彂璺緞</param>
+ /// <param name="str">杩斿洖鎻愮ずString</param>
+ /// <returns>鍑哄簱闆嗗悎</returns>
+ List<OutCommandDto> IssueOutHouseMk(string soNo, string outMode, int userId, string url, out string str);
/// <summary>
/// 涓嬪彂鍑哄簱锛堣皟鐢╟s鎺ュ彛缁欎粬搴撲綅鍦板潃锛�
@@ -166,8 +208,6 @@
/// <param name="str">鎻愮ず淇℃伅</param>
/// <returns>涓嬪彂鐨勬寚浠ら泦鍚�</returns>
List<OutCommandDto> IssueOutHouse(string soNo, string unstackingMode, string outMode, string loadingAddre, int userId,string url,out string str);
-
-
/// <summary>
/// wcs杩斿洖鐨勬垚鍔熶俊鍙锋垨鎵嬪姩瀹屾垚锛堝嚭搴撴垚鍔燂級
@@ -185,6 +225,13 @@
void RelocationSuccess(string taskNo, int userId);
/// <summary>
+ /// AGV浠诲姟鍙栬揣瀹屾垚鍙嶉
+ /// </summary>
+ /// <param name="taskNo"></param>
+ void AGVQuHuoSuccess(string taskNo);
+
+
+ /// <summary>
/// 閲嶆柊涓嬪彂鍑哄簱浠诲姟
/// </summary>
/// <param name="taskNo">浠诲姟鍙�</param>
--
Gitblit v1.8.0