From 7086c88c6c080aa9ff15664c5c97aee7bbcdc55b Mon Sep 17 00:00:00 2001 From: wankeda <Administrator@DESKTOP-HAU3ST3> Date: 星期三, 05 三月 2025 16:56:11 +0800 Subject: [PATCH] 阻焊仓堆垛机对接 --- 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs | 157 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 154 insertions(+), 3 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs" index dbd9c2a..ce08778 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs" @@ -30,6 +30,7 @@ using WIDESEA_DTO.ERP; using WIDESEA_DTO.MES; using WIDESEA_DTO.Stock; +using WIDESEA_DTO.Task; using WIDESEA_ITaskInfoRepository; using WIDESEA_Model.Models; @@ -76,7 +77,7 @@ /// <param name="qty">鏁伴噺</param> /// <param name="address">鍦板潃</param> /// <returns></returns> - WebResponseContent OutEmpty(int qty, string address, int WarehouseId); + WebResponseContent OutEmpty(int qty, string address, int WarehouseId, string barcode); /// <summary> /// WCS鐢宠鍏ュ簱 @@ -88,6 +89,24 @@ WebResponseContent DeviceRequestInboundTask(string stationCode, string roadwayNo, string palletCode); /// <summary> + /// 浠呯敵璇蜂换鍔★紝璁¦CS鏍规嵁璺敱纭畾涓嬩竴鍦板潃 + /// </summary> + /// <param name="stationCode"></param> + /// <param name="palletCode"></param> + /// <returns></returns> + 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); + + /// <summary> /// 鍏ュ簱浠诲姟鐢宠鍒嗛厤璐т綅 /// </summary> /// <param name="taskNum">浠诲姟鍙�</param> @@ -95,6 +114,15 @@ /// <param name="palletType">鎵樼洏绫诲瀷</param> /// <returns></returns> 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> /// @@ -129,7 +157,15 @@ /// </summary> /// <param name="keys"></param> /// <returns></returns> - WebResponseContent GenerateOutboundTask(int[] keys); + WebResponseContent GenerateOutboundTasks(int[] keys); + + + ///// <summary> + ///// 鐢熸垚MESPP澶у嵎鍑哄簱浠诲姟 + ///// </summary> + ///// <param name="keys"></param> + ///// <returns></returns> + //WebResponseContent MESPPGenerateOutboundTasks(int[] keys); /// <summary> /// 鍑哄簱浠诲姟瀹屾垚 @@ -195,6 +231,121 @@ /// <param name="model"></param> /// <returns></returns> MesResponseContent SubstrateBack(SubstrateBackModel model); - WebResponseContent OutEmpty(int qty, string address, int warehouseId); + + /// <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); + + /// <summary> + /// 淇敼浠诲姟鐘舵�� + /// </summary> + /// <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> + /// 鐢熸垚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); + + } } -- Gitblit v1.9.3