From 58a5a9af83492c5bbb4fba88b4443f08fa4becfc Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期二, 17 十二月 2024 19:53:14 +0800
Subject: [PATCH] 解决冲突
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs
index b2bd4ee..909d960 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs
@@ -79,6 +79,12 @@
/// <returns></returns>
Task<WebResponseContent> RequestWMSTask(string palletCode, string sourceAddress);
+ /// <summary>
+ /// 璇锋眰鍑哄簱鑷冲寘瑁�
+ /// </summary>
+ /// <param name="stationManager"></param>
+ /// <returns></returns>
+ Task<WebResponseContent> RequestOutTaskToBZAsync(Dt_StationManager stationManager);
/// <summary>
/// 鏍规嵁鎵樼洏鍙枫�佽捣濮嬪湴鍧�鍚慦MS璇锋眰浠诲姟
@@ -130,12 +136,29 @@
Dt_Task QueryExecutingConveyorLineTask(int taskNum, string nextAddress);
/// <summary>
+ /// 鏍规嵁鎵樼洏鍙枫�佷笅涓�鍦板潃鏌ヨ杈撻�佺嚎鎵ц涓殑浠诲姟
+ /// </summary>
+ /// <param name="taskNum">浠诲姟鍙�</param>
+ /// <param name="nextAddress">涓嬩竴鍦板潃</param>
+ /// <returns></returns>
+ Dt_Task QueryExecutingTaskByBarcode(string barcode, string nextAddress);
+
+ /// <summary>
/// 鏍规嵁浠诲姟鍙枫�佸綋鍓嶅湴鍧�鏌ヨ杈撻�佺嚎瀹屾垚鐨勪换鍔�
/// </summary>
/// <param name="taskNum">浠诲姟鍙�</param>
/// <param name="currentAddress">褰撳墠鍦板潃</param>
/// <returns></returns>
Dt_Task QueryCompletedConveyorLineTask(int taskNum, string currentAddress);
+
+
+ /// <summary>
+ /// 鏍规嵁鎵樼洏鍙枫�佸綋鍓嶅湴鍧�鏌ヨ浠诲姟
+ /// </summary>
+ /// <param name="taskNum">浠诲姟鍙�</param>
+ /// <param name="currentAddress">褰撳墠鍦板潃</param>
+ /// <returns></returns>
+ Dt_Task QueryBarcodeTask(string barcode, string currentAddress);
/// <summary>
/// 鏍规嵁浠诲姟鍙枫�佸綋鍓嶅湴鍧�鏌ヨ杈撻�佺嚎鏂板缓鐨勪换鍔�
@@ -250,5 +273,12 @@
/// <param name="Roadway"></param>
/// <returns></returns>
Dt_Task QueryTaskByPalletCode(string palletCode, string Roadway);
+
+ /// <summary>
+ /// 鏌ヨ褰撳墠璁惧鏄惁鏈夌Щ搴撲换鍔�
+ /// </summary>
+ /// <param name="deviceNo"></param>
+ /// <returns></returns>
+ Dt_Task QueryRelocationTask(string deviceNo);
}
}
\ No newline at end of file
--
Gitblit v1.9.3