From f723c6e9087a2110a28572543c7cfd9104e2a4ed Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期一, 23 十二月 2024 20:52:58 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs | 20 +++++++++++++++++++-
1 files changed, 19 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 19272e1..10cce98 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"
@@ -47,7 +47,8 @@
/// <param name="palletCode">鎵樼洏鍙�</param>
/// <param name="stationCode">绔欏彴鍙�</param>
/// <returns></returns>
- WebResponseContent RequestInboundTask(string palletCode, string stationCode);
+ //WebResponseContent RequestInboundTask(string palletCode, string stationCode);
+ WebResponseContent RequestInboundTask(SaveModel saveModel);
/// <summary>
/// 鍏ュ簱浠诲姟鐢宠鍒嗛厤璐т綅
@@ -92,5 +93,22 @@
/// <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>
+ /// 鍒ゆ柇鏄惁闇�瑕佺Щ搴�
+ /// </summary>
+ /// <param name="taskNum">浠诲姟鍙�</param>
+ /// <param name="locationCode">鍏ュ簱鎴栧嚭搴撶殑璐т綅鍙�</param>
+ /// <returns></returns>
+ WebResponseContent IsRelocation(int taskNum, string locationCode);
+>>>>>>> Stashed changes
}
}
--
Gitblit v1.9.3