From 636a0e56fb705177dbd043a90e47c4b8be20f8fc Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 24 十二月 2024 10:01:30 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs | 18 ++++++++----------
1 files changed, 8 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 10cce98..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"
@@ -39,7 +39,7 @@
{
ITaskRepository Repository { get; }
- WebResponseContent PushTasksToWCS();
+ WebResponseContent PushTasksToWCS(List<Dt_Task> tasks, string agvDescription = "");
/// <summary>
/// 鐢宠鍏ュ簱浠诲姟(PDA浣跨敤锛屼粎鎵樼洏缁戝畾鍏ュ簱绔欏彴锛屼笉鍒嗛厤璐т綅)
@@ -93,14 +93,6 @@
/// <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>
/// 鍒ゆ柇鏄惁闇�瑕佺Щ搴�
@@ -108,7 +100,13 @@
/// <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);
->>>>>>> Stashed changes
}
}
--
Gitblit v1.9.3