From 16749e23b489ee24f993fe9e87346680b7bcf63a Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期五, 10 十月 2025 21:14:49 +0800
Subject: [PATCH] 代码提交
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs | 175 ++++++++++++---------------------------------------------
1 files changed, 38 insertions(+), 137 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
index 261fc19..8007c87 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
@@ -51,119 +51,28 @@
public List<int> TaskOutboundTypes { get; }
/// <summary>
+ /// 鎵�鏈夌Щ搴撲换鍔＄被鍨�
+ /// </summary>
+ public List<int> TaskRelocationboundTypes { get; }
+
+ /// <summary>
+ /// 鎵�鏈堿GV鎼繍浠诲姟绫诲瀷
+ /// </summary>
+ public List<int> TaskAGVCarryboundTypes { get; }
+
+ /// <summary>
+ /// 鎵�鏈夎法妤煎眰浠诲姟绫诲瀷
+ /// </summary>
+ public List<int> TaskAcrossFloorboundTypes { get; }
+
+ /// <summary>
/// 鎺ユ敹WMS浠诲姟淇℃伅
/// </summary>
/// <param name="taskDTOs">WMS浠诲姟瀵硅薄闆嗗悎</param>
/// <returns>杩斿洖澶勭悊缁撴灉</returns>
WebResponseContent ReceiveWMSTask([NotNull] List<WMSTaskDTO> taskDTOs);
- /// <summary>
- /// 鏍规嵁璁惧缂栧彿銆佸綋鍓嶅湴鍧�鏌ヨ杈撻�佺嚎鏈墽琛岀殑浠诲姟
- /// </summary>
- /// <param name="deviceNo">璁惧缂栧彿</param>
- /// <param name="currentAddress">褰撳墠鍦板潃</param>
- /// <returns></returns>
- Dt_Task QueryConveyorLineTask(string deviceNo, string currentAddress);
-
-
- /// <summary>
- /// 鏍规嵁璁惧缂栧彿銆佸綋鍓嶅湴鍧�銆佹墭鐩樺彿鏌ヨ杈撻�佺嚎鏈墽琛岀殑浠诲姟
- /// </summary>
- /// <param name="deviceNo">璁惧缂栧彿</param>
- /// <param name="currentAddress">褰撳墠鍦板潃</param>
- /// <param name="Barcode">鎵樼洏鍙�</param>
- /// <returns></returns>
- Dt_Task QueryConveyorLineTask(string deviceNo, string currentAddress,string Barcode);
-
- /// <summary>
- /// 鏍规嵁璁惧缂栧彿銆佸綋鍓嶅湴鍧�鏌ヨ杈撻�佺嚎鏈墽琛岀殑浠诲姟
- /// </summary>
- /// <param name="deviceNo">璁惧缂栧彿</param>
- /// <param name="currentAddress">褰撳墠鍦板潃</param>
- /// <returns></returns>
- Dt_Task QueryNextConveyorLineTask(string deviceNo, string currentAddress);
-
- /// <summary>
- /// 鏍规嵁鎵樼洏鍙枫�佸綋鍓嶅湴鍧�鏌ヨ杈撻�佺嚎鏈墽琛岀殑浠诲姟
- /// </summary>
- /// <param name="Barcode">鎵樼洏鍙�</param>
- /// <param name="currentAddress">褰撳墠鍦板潃</param>
- /// <returns></returns>
- Dt_Task QueryBarCodeConveyorLineTask(string Barcode, string currentAddress);
-
- /// <summary>
- /// 鏍规嵁浠诲姟鍙枫�佷笅涓�鍦板潃鏌ヨ杈撻�佺嚎鎵ц涓殑浠诲姟
- /// </summary>
- /// <param name="taskNum">浠诲姟鍙�</param>
- /// <param name="nextAddress">涓嬩竴鍦板潃</param>
- /// <returns></returns>
- Dt_Task QueryExecutingConveyorLineTask(int taskNum, string nextAddress);
-
- /// <summary>
- /// 鏍规嵁浠诲姟鍙枫�佷笅涓�鍦板潃鏌ヨ杈撻�佺嚎鎵ц涓殑浠诲姟
- /// </summary>
- /// <param name="taskNum">浠诲姟鍙�</param>
- /// <param name="nextAddress">涓嬩竴鍦板潃</param>
- /// <returns></returns>
- Dt_Task QueryExecutingConveyorLineTask(int taskNum, string nextAddress, string Barcode);
-
- /// <summary>
- /// 鏍规嵁浠诲姟鍙枫�佹墭鐩樺彿銆佸綋鍓嶅湴鍧�鏌ヨ杈撻�佺嚎鎵ц涓殑浠诲姟
- /// </summary>
- /// <param name="taskNum">浠诲姟鍙�</param>
- /// <param name="currentAddress">褰撳墠鍦板潃</param>
- /// <param name="Barcode">鎵樼洏鍙�</param>
- /// <returns></returns>
- Dt_Task QueryExecutingCurrentConveyorLineTask(int taskNum, string currentAddress, string Barcode);
- /// <summary>
- /// 鏍规嵁鎵樼洏鍙枫�佷笅涓�鍦板潃鏌ヨ杈撻�佺嚎鎵ц涓殑浠诲姟
- /// </summary>
- /// <param name="taskNum">浠诲姟鍙�</param>
- /// <param name="nextAddress">涓嬩竴鍦板潃</param>
- /// <returns></returns>
- Dt_Task QueryExecutingConveyorLineTask(string nextAddress, string Barcode);
-
- /// <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>
- /// 鏍规嵁浠诲姟鍙枫�佸綋鍓嶅湴鍧�鏌ヨ杈撻�佺嚎鏂板缓鐨勪换鍔�
- /// </summary>
- /// <param name="taskNum">浠诲姟鍙�</param>
- /// <param name="currentAddress">褰撳墠鍦板潃</param>
- /// <returns></returns>
- Dt_Task QueryCraneConveyorLineTask(int taskNum, string currentAddress);
-
- /// <summary>
- /// 鏍规嵁璁惧缂栧彿銆佷换鍔＄被鍨嬪垎缁�(鍙��)鎸夌収浼樺厛绾т互鍙婂垱寤烘椂闂存帓搴忔煡璇换鍔℃睜鏂板鐨勪换鍔�
- /// </summary>
- /// <param name="deviceNo">璁惧缂栧彿</param>
- /// <param name="taskTypeGroup">浠诲姟绫诲瀷鍒嗙粍(鍙��)</param>
- /// <returns></returns>
- Dt_Task? QuertStackerCraneTask(string deviceNo, TaskTypeGroup? taskTypeGroup = null);
-
+
/// <summary>
/// 鏍规嵁璁惧缂栧彿銆佸綋鍓嶅湴鍧�鎸夌収浼樺厛绾т互鍙婂垱寤烘椂闂存帓搴忔煡璇换鍔℃睜鏂板鐨勪换鍔�
/// </summary>
@@ -198,26 +107,11 @@
List<Dt_Task> QueryAllOutboundTasks(string deviceNo, string currentAddress = "");
/// <summary>
- /// 鏍规嵁璁惧缂栧彿銆佸綋鍓嶅湴鍧�鎸夌収浼樺厛绾т互鍙婂垱寤烘椂闂存帓搴忔煡璇换鍔℃睜鍑哄簱绫诲瀷鐨勬柊澧炵殑浠诲姟
- /// </summary>
- /// <param name="deviceNo">璁惧缂栧彿</param>
- /// <param name="outStationCodes">褰撳墠鍦板潃</param>
- /// <returns>杩斿洖浠诲姟瀹炰綋瀵硅薄闆嗗悎锛屽彲鑳戒负null</returns>
- List<Dt_Task> QueryStackerCraneOutTasks(string deviceNo, List<string> outStationCodes);
-
- /// <summary>
/// 鏇存柊浠诲姟寮傚父淇℃伅鏄剧ず
/// </summary>
/// <param name="taskNum">浠诲姟鍙�</param>
/// <param name="message">寮傚父淇℃伅</param>
WebResponseContent UpdateTaskExceptionMessage(int taskNum, string message);
-
- /// <summary>
- /// 鏇存柊浠诲姟鐘舵�佷俊鎭紝骞跺悓姝ヨ嚦WMS
- /// </summary>
- /// <param name="taskNum">浠诲姟鍙�</param>
- /// <param name="status">浠诲姟鐘舵��</param>
- void UpdateTaskStatus(int taskNum, int status);
/// <summary>
/// 灏嗕换鍔＄姸鎬佷慨鏀逛负涓嬩竴涓姸鎬�
@@ -231,14 +125,6 @@
/// <param name="task">浠诲姟瀹炰綋瀵硅薄</param>
/// <returns></returns>
WebResponseContent UpdateTaskStatusToNext([NotNull] Dt_Task task);
-
- /// <summary>
- /// 鏍规嵁浠诲姟鍙枫�佸綋鍓嶅湴鍧�鏇存柊浠诲姟浣嶇疆淇℃伅
- /// </summary>
- /// <param name="taskNum">浠诲姟鍙�</param>
- /// <param name="currentAddress">褰撳墠鍦板潃</param>
- /// <returns></returns>
- Dt_Task? UpdatePosition(int taskNum, string currentAddress);
/// <summary>
/// 浠诲姟瀹屾垚
@@ -269,17 +155,32 @@
Dt_Task QueryRelocationTask(string deviceNo);
/// <summary>
- /// 鏌ヨ鏄惁瀛樺湪鐏浠诲姟
- /// </summary>
- /// <param name="deviceNo"></param>
- /// <returns></returns>
- Dt_Task QueryOutFireAlarmTask(string deviceNo);
-
- /// <summary>
/// 鍒犻櫎浠诲姟
/// </summary>
/// <param name="task"></param>
/// <returns></returns>
WebResponseContent Delete(Dt_Task task);
+
+ /// <summary>
+ /// 鍙戦�丄GV浠诲姟
+ /// </summary>
+ /// <param name="modelProcessCode"></param>
+ /// <param name="task"></param>
+ /// <returns></returns>
+ Task<WebResponseContent> SendAgvTask(string modelProcessCode, int taskNum);
+
+ /// <summary>
+ /// AGV缁х画浠诲姟
+ /// </summary>
+ /// <param name="modelProcessCode"></param>
+ /// <param name="task"></param>
+ /// <returns></returns>
+ Task<WebResponseContent> ContinueAgvTask(string AGVTaskNum);
+
+
+ Dt_Task QueryRequestConveyorLineSignalTask();
+
+
+ Dt_Task QueryRequestTSJSignalTask();
}
}
\ No newline at end of file
--
Gitblit v1.9.3