From 9077c2065bb89e0948405200f9abab399d19a319 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期一, 23 十二月 2024 21:03:47 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs | 4 +---
1 files changed, 1 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 10cce98..e0ff5c3 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"
@@ -93,14 +93,13 @@
/// <param name="taskNum">浠诲姟鍙�</param>
/// <returns></returns>
WebResponseContent OutboundTaskCompleted(int taskNum);
-<<<<<<< Updated upstream
+
/// <summary>
/// 娴嬭瘯鏋堕��搴�
/// </summary>
/// <param name="backModel"></param>
/// <returns></returns>
MesResponseContent TestReturnStock(TestToolBackModel backModel);
-=======
/// <summary>
/// 鍒ゆ柇鏄惁闇�瑕佺Щ搴�
@@ -109,6 +108,5 @@
/// <param name="locationCode">鍏ュ簱鎴栧嚭搴撶殑璐т綅鍙�</param>
/// <returns></returns>
WebResponseContent IsRelocation(int taskNum, string locationCode);
->>>>>>> Stashed changes
}
}
--
Gitblit v1.9.3