From 18d1f45193e34e00fc1b6f65b8596ddb29c5267d Mon Sep 17 00:00:00 2001 From: dengjunjie <dengjunjie@hnkhzn.com> Date: 星期二, 24 十二月 2024 15:32:43 +0800 Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn --- 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs | 64 +++++++++++++++++++++++++++++++ 1 files changed, 63 insertions(+), 1 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 d803621..263037e 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" @@ -22,11 +22,13 @@ using System.Linq; using System.Text; using System.Threading.Tasks; +using WIDESEA_Common.CommonEnum; using WIDESEA_Core; using WIDESEA_Core.BaseServices; using WIDESEA_Core.Enums; using WIDESEA_DTO; using WIDESEA_DTO.ERP; +using WIDESEA_DTO.MES; using WIDESEA_DTO.Stock; using WIDESEA_ITaskInfoRepository; using WIDESEA_Model.Models; @@ -37,8 +39,31 @@ { ITaskRepository Repository { get; } - WebResponseContent RequestInboundTask(string palletCode, string stationCode); + WebResponseContent PushTasksToWCS(List<Dt_Task> tasks, 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="taskNum">浠诲姟鍙�</param> + /// <param name="roadwayNo">宸烽亾鍙�</param> + /// <param name="palletType">鎵樼洏绫诲瀷</param> + /// <returns></returns> + WebResponseContent AssignInboundTaskLocation(int taskNum, string roadwayNo); + + /// <summary> + /// + /// </summary> + /// <param name="taskNum"></param> + /// <returns></returns> WebResponseContent InboundTaskCompleted(int taskNum); /// <summary> /// 娴嬭瘯鏋跺嚭浠� @@ -46,5 +71,42 @@ /// <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 GenerateOutboundTask(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 toolScrap); + WebResponseContent IsRelocation(int taskNum, string locationCode); } } -- Gitblit v1.9.3