From e7be74e711076896e7e841b54691daa95067c567 Mon Sep 17 00:00:00 2001 From: wangxinhui <wangxinhui@hnkhzn.com> Date: 星期四, 12 六月 2025 15:54:49 +0800 Subject: [PATCH] 1 --- 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs | 81 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 77 insertions(+), 4 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 eaa245d..4e12dc7 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" @@ -15,6 +15,7 @@ *----------------------------------------------------------------*/ #endregion << 鐗� 鏈� 娉� 閲� >> +using Microsoft.AspNetCore.Mvc; using SqlSugar; using System; using System.Collections.Generic; @@ -46,7 +47,7 @@ /// <param name="tasks"></param> /// <param name="agvDescription"></param> /// <returns></returns> - WebResponseContent PushTasksToWCS(List<Dt_Task> tasks, string agvDescription = ""); + WebResponseContent PushTasksToWCS(List<Dt_Task> tasks, string agvDescription = "", string agvtaskNum = ""); /// <summary> /// @@ -54,7 +55,7 @@ /// <param name="taskNum"></param> /// <param name="agvDescription"></param> /// <returns></returns> - WebResponseContent PushTasksToWCSSingle(int taskNum, string agvDescription = ""); + WebResponseContent PushTasksToWCSSingle(int taskNum, string agvDescription = "", string agvtaskNum = ""); /// <summary> /// 鐢宠鍏ュ簱浠诲姟(PDA浣跨敤锛屼粎鎵樼洏缁戝畾鍏ュ簱绔欏彴锛屼笉鍒嗛厤璐т綅) @@ -86,7 +87,7 @@ /// <param name="roadwayNo"></param> /// <param name="palletCode"></param> /// <returns></returns> - WebResponseContent DeviceRequestInboundTask(string stationCode, string roadwayNo, string palletCode); + WebResponseContent DeviceRequestInboundTask(string stationCode, string roadwayNo, string palletCode,string materielBoxCode = ""); /// <summary> /// 浠呯敵璇蜂换鍔★紝璁¦CS鏍规嵁璺敱纭畾涓嬩竴鍦板潃 @@ -124,12 +125,14 @@ /// <returns></returns> WebResponseContent AssignInboundTaskLocationByHeight(int taskNum, string roadwayNo, int heightType); + WebResponseContent RequestZHInboundTask(string agvTaskCode, string palletCode, string palletType, string materialLot); + /// <summary> /// /// </summary> /// <param name="taskNum"></param> /// <returns></returns> - WebResponseContent TaskCompleted(int taskNum); + Task<WebResponseContent> TaskCompleted(int taskNum); /// <summary> /// @@ -144,6 +147,10 @@ /// <returns></returns> MesResponseContent TestToolOut(TestToolOutModel model); + //闃茬剨鍒扮嚎杈� + MesResponseContent SolderMaskOut(SolderMaskOut model); + //闃茬剨娲惧伐 + MesResponseContent SolderMaskOutNotice(SolderMaskOutNotice model); /// <summary> /// 鐢熸垚鍑哄簱浠诲姟 /// </summary> @@ -252,6 +259,13 @@ MesResponseContent QueryPpByWidth(QueryPpByWidthModel model); /// <summary> + /// 鎴愬搧杩斿伐鎻愬簱 + /// </summary> + /// <param name="model"></param> + /// <returns></returns> + MesResponseContent RworkTask(RworkTaskModel model); + + /// <summary> /// /// </summary> /// <param name="roadwayNos"></param> @@ -307,5 +321,64 @@ 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> + /// <param name="barCode"></param> + /// <param name="startPoint"></param> + /// <returns></returns> + WebResponseContent EmptyBackTask(string barCode, string startPoint); + /// <summary> + /// 浜哄伐閫夋嫨搴撳瓨 + /// </summary> + WebResponseContent OutProductSelect(int orderDetailId, List<ProStockViewDTO> proStockViews); + WebResponseContent GetZHMesMaterialLot(string materialLot); } } -- Gitblit v1.9.3