From 4d83bc8431bb1fda7b3cef959e2505b2402285d2 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期四, 26 十二月 2024 21:53:14 +0800
Subject: [PATCH] ·
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 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..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浣跨敤锛屼粎鎵樼洏缁戝畾鍏ュ簱绔欏彴锛屼笉鍒嗛厤璐т綅)
@@ -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