From f2bc08e28dda7022202f07217f6a3c150f818af7 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期一, 20 一月 2025 08:32:16 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/liudongl/jc24-wms
---
Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs b/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs
index d72b933..59d9535 100644
--- a/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs
+++ b/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs
@@ -15,7 +15,7 @@
/// </summary>
/// <param name="model">妯″瀷</param>
/// <returns></returns>
- bool ErpAddExportNotice(SoInfo model);
+ void HttpAddExportNotice(SoInfo model);
/// <summary>
/// 鑾峰彇鎵ц瀹屾垚鐨勫崟鎹彂閫佽嚦erp
/// </summary>
@@ -23,7 +23,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 userNo, string pwd, int userId);
//------------------------------------------------------------------------------------------
/// <summary>
@@ -49,7 +49,7 @@
/// <param name="type">绫诲瀷</param>
/// <param name="msg">鐗╂祦缂栫爜銆佸悕绉般�佹壒娆�</param>
/// <returns></returns>
- List<ExStockInfoDto> GetStockGroupList( string type, string msg);
+ List<ExStockInfoDto> GetStockGroupList( string type, string ownerNo, string msg);
/// <summary>
/// 娣诲姞鍑哄簱鍗�
/// </summary>
@@ -126,14 +126,21 @@
/// <param name="url">涓嬪彂鍑哄簱璺緞</param>
/// <param name="str">鎻愮ず淇℃伅</param>
/// <returns>涓嬪彂鐨勬寚浠ら泦鍚�</returns>
- List<OutCommandDto> IssueOutHouse(string soNo, string outMode, 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杩斿洖鐨勬垚鍔熶俊鍙锋垨鎵嬪姩瀹屾垚锛堝嚭搴撴垚鍔燂級
/// </summary>
/// <param name="taskNo">浠诲姟鍙�</param>
/// <param name="userId">鎿嶄綔浜�</param>
/// <returns></returns>
- void ExportSuccess(string taskNo,int userId);
+ void ExportSuccess(string taskNo,int userId,string url);
+
+ /// <summary>
+ /// wcs杩斿洖鐨勬垚鍔熶俊鍙锋垨鎵嬪姩瀹屾垚锛堢Щ搴撴垚鍔燂級
+ /// </summary>
+ /// <param name="taskNo"></param>
+ /// <param name="userId"></param>
+ void RelocationSuccess(string taskNo, int userId);
/// <summary>
/// 閲嶆柊涓嬪彂鍑哄簱浠诲姟
@@ -142,7 +149,7 @@
/// <param name="userId">鎿嶄綔浜�</param>
/// <param name="url">涓嬪彂璺緞</param>
/// <returns></returns>
- OutCommandDto AgainSendSoTask(string taskNo, int userId,string url);
+ OutCommandDto AgainSendSoTask(string taskNo, string Receiver, int userId,string url);
/// <summary>
/// 鎵嬪姩鍙栨秷鍑哄簱浠诲姟
/// </summary>
@@ -208,5 +215,20 @@
/// <param name="soNo"></param>
/// <returns></returns>
string IsNeedUnpack(string soNo);
+
+ /// <summary>
+ /// 鑾峰彇鎷嗗灈鎵樼洏鎷嗗灈淇℃伅
+ /// </summary>
+ /// <param name="model">鎷嗗灈鎵樼洏鍙峰拰WCS浠诲姟鍙�</param>
+ /// <returns>鎷嗗灈鎵樼洏淇℃伅</returns>
+
+ public RequestBoxInfoCheck BoxInfoCheckWcs(BoxInfoCheck model);
+
+ /// <summary>
+ /// 鎷嗗灈鍒嗘嫞涓绘壂绠辩爜鍑哄簱
+ /// </summary>
+ /// <param name="boxno"></param>
+ /// <returns></returns>
+ string BoxInfoExportWcs(string boxno);
}
}
--
Gitblit v1.8.0