From c6e8b600398de38b6684f5fa1eaaaade8562859b Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 20 九月 2025 15:16:56 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/LongDeLiLiKu
---
项目代码/WMS/WMSServices/WIDESEA_ITaskInfoService/ITaskService.cs | 350 ++++++++++++++-------------------------------------------
1 files changed, 89 insertions(+), 261 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_ITaskInfoService/ITaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_ITaskInfoService/ITaskService.cs"
index aa30edb..4da871c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_ITaskInfoService/ITaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_ITaskInfoService/ITaskService.cs"
@@ -56,39 +56,7 @@
/// <param name="agvDescription"></param>
/// <returns></returns>
WebResponseContent PushTasksToWCSSingle(int taskNum, string agvDescription = "");
-
- /// <summary>
- /// 鐢宠鍏ュ簱浠诲姟(PDA浣跨敤锛屼粎鎵樼洏缁戝畾鍏ュ簱绔欏彴锛屼笉鍒嗛厤璐т綅)
- /// </summary>
- /// <param name="palletCode">鎵樼洏鍙�</param>
- /// <param name="stationCode">绔欏彴鍙�</param>
- /// <returns></returns>
- //WebResponseContent RequestInboundTask(string palletCode, string stationCode);
- WebResponseContent RequestInboundTask(SaveModel saveModel);
- /// <summary>
- /// 绌虹鍏ュ簱
- /// </summary>
- /// <param name="barcode"></param>
- /// <param name="address"></param>
- /// <returns></returns>
- WebResponseContent InEmpty(string barcode, string address, int WarehouseId);
- /// <summary>
- /// 绌虹鍑哄簱
- /// </summary>
- /// <param name="qty">鏁伴噺</param>
- /// <param name="address">鍦板潃</param>
- /// <returns></returns>
- WebResponseContent OutEmpty(int qty, string address, int WarehouseId, string barcode);
-
- /// <summary>
- /// WCS鐢宠鍏ュ簱
- /// </summary>
- /// <param name="stationCode"></param>
- /// <param name="roadwayNo"></param>
- /// <param name="palletCode"></param>
- /// <returns></returns>
- WebResponseContent DeviceRequestInboundTask(string stationCode, string roadwayNo, string palletCode,string materielBoxCode = "");
-
+
/// <summary>
/// 浠呯敵璇蜂换鍔★紝璁￤CS鏍规嵁璺敱纭畾涓嬩竴鍦板潃
/// </summary>
@@ -98,14 +66,24 @@
WebResponseContent DeviceRequestInboundTaskSimple(string stationCode, string palletCode);
/// <summary>
- ///
+ /// 鍘熸枡鍏ュ簱浠诲姟璇锋眰
/// </summary>
- /// <param name="stationCode"></param>
- /// <param name="palletCode"></param>
- /// <param name="roadwayNos"></param>
- /// <param name="heightType"></param>
/// <returns></returns>
- WebResponseContent DeviceRequestInboundTaskByRoadways(string stationCode, string palletCode, List<string> roadwayNos, int heightType);
+ WebResponseContent RequestYLWMSTaskSimple(string stationCode, string palletCode);
+
+ /// <summary>
+ /// 鍘熸枡鍏ュ簱鐢宠
+ /// </summary>
+ /// <param name="palletCode"></param>
+ /// <returns></returns>
+ WebResponseContent YLPurchaseBoxing(string palletCode);
+
+ /// <summary>
+ /// 鍒嗛厤鍘熸枡宸烽亾
+ /// </summary>
+ /// <returns></returns>
+ string AssignYLRoadwayNo(string palletCode);
+
/// <summary>
/// 鍏ュ簱浠诲姟鐢宠鍒嗛厤璐т綅
@@ -117,70 +95,11 @@
WebResponseContent AssignInboundTaskLocation(int taskNum, string roadwayNo);
/// <summary>
- ///
- /// </summary>
- /// <param name="taskNum"></param>
- /// <param name="roadwayNo"></param>
- /// <param name="heightType"></param>
- /// <returns></returns>
- WebResponseContent AssignInboundTaskLocationByHeight(int taskNum, string roadwayNo, int heightType);
-
- /// <summary>
- ///
+ /// 浠诲姟瀹屾垚
/// </summary>
/// <param name="taskNum"></param>
/// <returns></returns>
Task<WebResponseContent> TaskCompleted(int taskNum);
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="taskNum"></param>
- /// <returns></returns>
- WebResponseContent InboundTaskCompleted(int taskNum);
- /// <summary>
- /// 娴嬭瘯鏋跺嚭浠�
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- MesResponseContent TestToolOut(TestToolOutModel model);
-
- /// <summary>
- /// 鐢熸垚鍑哄簱浠诲姟
- /// </summary>
- /// <param name="orderDetailId"></param>
- /// <param name="stockSelectViews"></param>
- /// <returns></returns>
- WebResponseContent GenerateOutboundTask(int orderDetailId, List<StockSelectViewDTO> stockSelectViews);
-
- /// <summary>
- /// 鐢熸垚鍑哄簱浠诲姟
- /// </summary>
- /// <param name="keys"></param>
- /// <returns></returns>
- WebResponseContent GenerateOutboundTasks(int[] keys);
-
- /// <summary>
- /// 鍑哄簱浠诲姟瀹屾垚
- /// </summary>
- /// <param name="taskNum">浠诲姟鍙�</param>
- /// <returns></returns>
- WebResponseContent OutboundTaskCompleted(int taskNum);
-
- /// <summary>
- /// 鍒ゆ柇鏄惁闇�瑕佺Щ搴�
- /// </summary>
- /// <param name="taskNum">浠诲姟鍙�</param>
- /// <param name="locationCode">鍏ュ簱鎴栧嚭搴撶殑璐т綅鍙�</param>
- /// <returns></returns>
- MesResponseContent TestToolBack(TestToolBackModel backModel);
-
- /// <summary>
- /// 娴嬭瘯鏋舵姤搴�
- /// </summary>
- /// <param name="toolScrap"></param>
- /// <returns></returns>
- MesResponseContent TestScrap(TestToolScrap toolScraps);
/// <summary>
///
@@ -191,113 +110,11 @@
WebResponseContent IsRelocation(int taskNum, string locationCode);
/// <summary>
- ///
- /// </summary>
- /// <param name="toolSynInfo"></param>
- /// <returns></returns>
- WebResponseContent TestSynStock(TestToolSynInfo toolSynInfo);
-
- /// <summary>
/// 閫夋嫨搴撳瓨鐢熸垚鍑哄簱浠诲姟
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- WebResponseContent Outbound(int id);
-
- /// <summary>
- /// 鐗╂枡鍑哄簱锛學MS鍚屾鍑哄簱鐗╂枡鎵规鑷矼ES
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- WebResponseContent UploadMesMaterialLotaAcept(MesMaterialLotaAceptModel model);
-
- /// <summary>
- /// 鍩烘澘鍑哄簱
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- MesResponseContent SubstrateOut(SubstrateOutModel model);
-
- /// <summary>
- /// 鍩烘澘浣欐枡閫�搴�
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- MesResponseContent SubstrateBack(SubstrateBackModel model);
-
- /// <summary>
- /// PP澶у嵎鍑哄簱-杩涜鍒嗗嵎
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- MesResponseContent PPSubsectionOut(PPSubsectionOutModel model);
-
- /// <summary>
- /// PP灏忓嵎鍑哄簱
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- MesResponseContent PPCutOut(PPCutOutModle model);
-
- /// <summary>
- /// PP鍏ュ簱(澶у嵎銆佸皬鍗枫�佸紶鏂�)
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- MesResponseContent PPBack(PPBackModel model);
- /// <summary>
- /// PP搴撳瓨鏌ヨ
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- MesResponseContent QueryPpByWidth(QueryPpByWidthModel model);
-
- /// <summary>
- /// 鎴愬搧杩斿伐鎻愬簱
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- MesResponseContent RworkTask(RworkTaskModel model);
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="roadwayNos"></param>
- /// <param name="taskNum"></param>
- /// <param name="heightType"></param>
- /// <returns></returns>
- WebResponseContent AssignRoadwayByHeight(List<string> roadwayNos, int taskNum, int heightType = 0);
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="roadwayNos"></param>
- /// <param name="palletCode"></param>
- /// <param name="heightType"></param>
- /// <returns></returns>
- WebResponseContent AssignRoadwayByHeightAndCode(List<string> roadwayNos, string palletCode, int heightType = 0);
-
- /// <summary>
- /// 鍒嗛厤宸烽亾
- /// </summary>
- /// <param name="taskNum"></param>
- /// <param name="roadwayNos"></param>
- /// <returns></returns>
- WebResponseContent AssignRoadway(int taskNum, List<string> roadwayNos, int heightType);
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="roadwayNos"></param>
- /// <returns></returns>
- WebResponseContent SingleAssignRoadway(List<string> roadwayNos);
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="orderId"></param>
- /// <returns></returns>
- WebResponseContent HandSubstrateOut(int orderId);
+ WebResponseContent Outbound(List<int> ids);
/// <summary>
/// 淇敼浠诲姟鐘舵��
@@ -305,63 +122,7 @@
/// <param name="task"></param>
/// <returns></returns>
WebResponseContent UpdateTaskInfo(WCSTaskDTO task);
-
- /// <summary>
- /// PP浠揳gv鎼繍浠诲姟
- /// </summary>
- /// <param name="task"></param>
- /// <returns></returns>
- WebResponseContent AGVTasks(SaveModel saveModel);
-
-
- WebResponseContent GeneratePKOutboundTask(int orderDetailId, List<StockSelectViewDTO> stockSelectViews);
- /// <summary>
- /// MES鎴愬搧鍐呭寘淇℃伅鎺ユ敹
- /// </summary>
- /// <returns></returns>
- MesResponseContent BagInfoSync(MesBagInfoModel bagInfoModel);
- /// <summary>
- /// MES鎴愬搧澶栧寘淇℃伅鎺ユ敹
- /// </summary>
- /// <param name="boxInfoModel"></param>
- /// <returns></returns>
- MesResponseContent BoxStockin(MesBoxInfoModel boxInfoModel);
- /// <summary>
- /// MES鎴愬搧鍑哄簱鎺ュ彛璋冪敤
- /// </summary>
- /// <returns></returns>
- WebResponseContent ShipmentOrderSync(MesShipmentOrderSync model);
- /// <summary>
- /// 鐢熸垚MESPP澶у嵎鍑哄簱浠诲姟
- /// </summary>
- /// <param name="keys"></param>
- /// <returns></returns>
- WebResponseContent MESPPGenerateOutboundTasks(int[] keys);
-
- /// <summary>
- /// 鐢熸垚MESPP灏忓嵎鍑哄簱浠诲姟
- /// </summary>
- /// <param name="keys"></param>
- /// <returns></returns>
- //WebResponseContent PPCutOutGenerateOutboundTasks(int[] keys);
-
- WebResponseContent PPCutOutGenerateOutboundTasks(int orderDetailId, List<PPStockSelectViewDTO> stockSelectViews);
-
- WebResponseContent PPGeneratePKOutboundTask(int orderDetailId, List<PPStockSelectViewDTO> stockSelectViews);
- /// <summary>
- /// 鐢熸垚鎴愬搧鍑哄簱浠诲姟
- /// </summary>
- /// <param name="ProOutNo">鍑哄簱璁㈠崟鍙�</param>
- /// <param name="StationCode">绔欏彴鍦板潃</param>
- /// <returns></returns>
- Task<WebResponseContent> OutProductTask(int[] keys, string StationCode, int Grade);
- /// <summary>
- /// 鎴愬搧浣欐枡閫�搴撳叆浠�
- /// </summary>
- /// <param name="barCode"></param>
- /// <param name="startPoint"></param>
- /// <returns></returns>
- WebResponseContent BackProductTask(string barCode, string startPoint);
+
/// <summary>
/// 鎴愬搧绌烘鍥炲簱
/// </summary>
@@ -369,9 +130,76 @@
/// <param name="startPoint"></param>
/// <returns></returns>
WebResponseContent EmptyBackTask(string barCode, string startPoint);
+
/// <summary>
- /// 浜哄伐閫夋嫨搴撳瓨
+ /// 杈呮枡/鎴愬搧涓存椂鍏ュ簱
/// </summary>
- WebResponseContent OutProductSelect(int orderDetailId, List<ProStockViewDTO> proStockViews);
+ /// <returns></returns>
+ WebResponseContent InboundFLOrCPTask(string barCode, string startPoint, string matCode, int matCount);
+
+ /// <summary>
+ /// 鎴愬搧鍑哄簱
+ /// </summary>
+ /// <returns></returns>
+ WebResponseContent RequestCPWMSTaskOut(string materialCode, int Count,int targetId);
+
+ ///// <summary>
+ ///// 鏃犵汉甯冨嚭搴�
+ ///// </summary>
+ ///// <param name="Count"></param>
+ ///// <returns></returns>
+ //WebResponseContent RequestWFBWMSTaskOut(int Count);
+
+ /// <summary>
+ /// 鍘熸枡鍑哄簱浠诲姟
+ /// </summary>
+ /// <param name="materielCode">鐗╂枡浠ｇ爜</param>
+ /// <param name="materielWide">鐗╂枡骞呭</param>
+ /// <param name="Count">鍗锋暟</param>
+ /// <returns></returns>
+ WebResponseContent RequestYLWMSTaskOut(string materielCode, int materielWide, int Count, string address = "");
+
+ /// <summary>
+ /// 鍘熸枡绉诲簱
+ /// </summary>
+ /// <param name="startAddress"></param>
+ /// <param name="endAddress"></param>
+ /// <param name="roadWay"></param>
+ /// <returns></returns>
+ WebResponseContent IsRelocation(string startAddress, string endAddress, string roadWay);
+ /// <summary>
+ /// 鍘熸枡宸烽亾闂寸Щ搴撲换鍔�
+ /// </summary>
+ WebResponseContent RelocationRoadWay(string roadWay,int Count);
+
+ /// <summary>
+ /// 鍒嗛厤宸烽亾
+ /// </summary>
+ /// <returns></returns>
+ string AssignCPRoadwayNo();
+ /// <summary>
+ /// 鍗板埛浣欐枡閫�鏂欎换鍔�
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
+ WebResponseContent PrintBackInbound(SaveModel saveModel);
+
+ /// <summary>
+ /// 鍗板埛涓嬫枡浠诲姟
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
+ WebResponseContent PrintInbound(SaveModel saveModel);
+ /// <summary>
+ /// 鍒涘缓鍘熺焊鐢熶骇鎺掔▼鍑哄簱浠诲姟
+ /// </summary>
+ /// <param name="keys"></param>
+ /// <returns></returns>
+ WebResponseContent CreateBSTOutboundTasks(int[] keys);
+ /// <summary>
+ /// MES鑷姩鍙枡鎺ュ彛
+ /// </summary>
+ /// <returns></returns>
+ WebResponseContent ReceiveAutoIssue(MESAutoIssueDTO autoIssueDTO);
}
}
--
Gitblit v1.9.3