From 3a3f17f0890d721d97b139f88dde7df5c13ba688 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 06 一月 2025 18:51:21 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 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..4f777b0 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,9 @@
{
ITaskRepository Repository { get; }
- WebResponseContent PushTasksToWCS();
+ WebResponseContent PushTasksToWCS(List<Dt_Task> tasks, string agvDescription = "");
+
+ WebResponseContent PushTasksToWCSSingle(int taskNum, string agvDescription = "");
/// <summary>
/// 鐢宠鍏ュ簱浠诲姟(PDA浣跨敤锛屼粎鎵樼洏缁戝畾鍏ュ簱绔欏彴锛屼笉鍒嗛厤璐т綅)
@@ -51,6 +53,15 @@
WebResponseContent RequestInboundTask(SaveModel saveModel);
/// <summary>
+ /// WCS鐢宠鍏ュ簱
+ /// </summary>
+ /// <param name="stationCode"></param>
+ /// <param name="roadwayNo"></param>
+ /// <param name="palletCode"></param>
+ /// <returns></returns>
+ WebResponseContent DeviceRequestInboundTask(string stationCode, string roadwayNo, string palletCode);
+
+ /// <summary>
/// 鍏ュ簱浠诲姟鐢宠鍒嗛厤璐т綅
/// </summary>
/// <param name="taskNum">浠诲姟鍙�</param>
@@ -58,6 +69,8 @@
/// <param name="palletType">鎵樼洏绫诲瀷</param>
/// <returns></returns>
WebResponseContent AssignInboundTaskLocation(int taskNum, string roadwayNo);
+
+ WebResponseContent TaskCompleted(int taskNum);
/// <summary>
///
@@ -93,14 +106,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 +113,20 @@
/// <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 toolScraps);
WebResponseContent IsRelocation(int taskNum, string locationCode);
->>>>>>> Stashed changes
+ WebResponseContent TestSynStock(TestToolSynInfo toolSynInfo);
+ /// <summary>
+ /// 閫夋嫨搴撳瓨鐢熸垚鍑哄簱浠诲姟
+ /// </summary>
+ /// <param name="id"></param>
+ /// <returns></returns>
+ WebResponseContent Outbound(int id);
}
}
--
Gitblit v1.9.3