From 597cca93854339e7b7df7e516a75d0d4936faea7 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期一, 23 十二月 2024 21:04:09 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs | 7 ++++---
1 files changed, 4 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..12ac797 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,22 +93,23 @@
/// <param name="taskNum">浠诲姟鍙�</param>
/// <returns></returns>
WebResponseContent OutboundTaskCompleted(int taskNum);
-<<<<<<< Updated upstream
+
/// <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>
WebResponseContent IsRelocation(int taskNum, string locationCode);
->>>>>>> Stashed changes
}
}
--
Gitblit v1.9.3