From 208193e821f7e8b950a3e069ffd1d28a646ffd8b Mon Sep 17 00:00:00 2001 From: wangxinhui <wangxinhui@hnkhzn.com> Date: 星期二, 24 十二月 2024 00:23:30 +0800 Subject: [PATCH] 1 --- 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 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 12ac797..daedf38 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" @@ -95,21 +95,18 @@ WebResponseContent OutboundTaskCompleted(int taskNum); /// <summary> -<<<<<<< Updated upstream - /// 娴嬭瘯鏋堕��搴� - /// </summary> - /// <param name="backModel"></param> - /// <returns></returns> - MesResponseContent TestReturnStock(TestToolBackModel backModel); - - /// <summary> -======= ->>>>>>> Stashed changes /// 鍒ゆ柇鏄惁闇�瑕佺Щ搴� /// </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