From b489f865bab00bedfce5e8f772095600b8034ac0 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 23 九月 2025 03:03:20 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 115 insertions(+), 3 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
index 889d452..09c3b8d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
@@ -28,6 +28,7 @@
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_Core.Enums;
+using WIDESEAWCS_DTO.Agv;
using WIDESEAWCS_DTO.TaskInfo;
using WIDESEAWCS_Model.Models;
@@ -63,9 +64,36 @@
/// <param name="palletCode">鎵樼洏鍙�</param>
/// <param name="sourceAddress">璧峰鍦板潃</param>
/// <returns></returns>
- WebResponseContent RequestWMSTask(string palletCode, string sourceAddress);
+ WebResponseContent RequestWMSTask(string palletCode, string sourceAddress, string materielBoxCode = "");
+
+ WebResponseContent RequestWMSZHTask(string agvTaskCode, string palletCode, string palletType,string materialLot);
- WebResponseContent RequestWMSTask(string palletCode, string sourceAddress, string roadway);
+ /// <summary>
+ /// 鍚慦MS鐢宠浠诲姟
+ /// </summary>
+ /// <param name="palletCode">鎵樼洏鍙�</param>
+ /// <param name="sourceAddress">璧峰鍦板潃</param>
+ /// <returns></returns>
+ WebResponseContent RequestWMSTaskSimple(string palletCode, string sourceAddress);
+
+ /// <summary>
+ /// 鍚慦MS鐢宠浠诲姟
+ /// </summary>
+ /// <param name="palletCode">鎵樼洏鍙�</param>
+ /// <param name="sourceAddress">璧峰鍦板潃</param>
+ /// <param name="roadway">宸烽亾鍙�</param>
+ /// <returns></returns>
+ //WebResponseContent RequestWMSTask(string palletCode, string sourceAddress, string roadway);
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="sourceAddress"></param>
+ /// <param name="palletCode"></param>
+ /// <param name="heightType"></param>
+ /// <param name="roadways"></param>
+ /// <returns></returns>
+ WebResponseContent RequestWMSTask(string palletCode, string sourceAddress, int heightType, List<string> roadways);
/// <summary>
/// 鍚慦MS鐢宠鍒嗛厤璐т綅
@@ -75,6 +103,20 @@
/// <returns></returns>
string? RequestAssignLocation(int taskNum, string roadwayNo);
+ /// <summary>
+ /// 鍚慦MS鐢宠鍒嗛厤璐т綅
+ /// </summary>
+ /// <param name="taskNum">浠诲姟鍙�</param>
+ /// <param name="roadwayNo">宸烽亾鍙�</param>
+ /// <param name="heightType">楂樺害</param>
+ /// <returns></returns>
+ string? RequestAssignLocationByHeight(int taskNum, string roadwayNo, int heightType);
+
+ /// <summary>
+ /// 浠诲姟瀹屾垚
+ /// </summary>
+ /// <param name="taskNum">浠诲姟鍙�</param>
+ /// <returns></returns>
WebResponseContent TaskCompleted(int taskNum);
/// <summary>
@@ -100,6 +142,11 @@
/// <param name="currentAddress">褰撳墠鍦板潃</param>
/// <returns>杩斿洖浠诲姟瀹炰綋瀵硅薄锛屽彲鑳戒负null</returns>
Dt_Task QueryStackerCraneInTask(string deviceNo, string currentAddress = "");
+
+ /// <summary>
+ /// 鏍规嵁璁惧缂栧彿鍒涘缓鏃堕棿鎺掑簭鏌ヨ浠诲姟姹犵Щ搴撲换鍔�
+ /// </summary>
+ Dt_Task QueryStackerCraneRelocationTask(string deviceNo);
/// <summary>
/// 鏍规嵁璁惧缂栧彿銆佸綋鍓嶅湴鍧�鎸夌収浼樺厛绾т互鍙婂垱寤烘椂闂存帓搴忔煡璇换鍔℃睜鍑哄簱绫诲瀷鐨勬柊澧炵殑浠诲姟
@@ -161,6 +208,11 @@
/// <returns></returns>
AgvResponseContent AgvUpdateTask(AgvUpdateDTO agvUpdateModel);
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <returns></returns>
WebResponseContent SendSecureReplyToAgv(int taskNum);
/// <summary>
@@ -173,7 +225,7 @@
/// <param name="targetAddress">淇敼鍚庣殑鐩爣鍦板潃</param>
/// <param name="currentAddress">淇敼鍚庣殑褰撳墠鍦板潃</param>
/// <param name="nextAddress">淇敼鍚庣殑涓嬩竴鍦板潃</param>
- void UpdateTask(Dt_Task task, TaskStatusEnum taskStatus, string deviceCode = "", string sourceAddress = "", string targetAddress = "", string currentAddress = "", string nextAddress = "");
+ void UpdateTask(Dt_Task task, TaskStatusEnum taskStatus, string deviceCode = "", string sourceAddress = "", string targetAddress = "", string currentAddress = "", string nextAddress = "", string roadwayNo = "", int heightType = 0);
/// <summary>
/// 璇锋眰鍒嗛厤宸烽亾
@@ -187,7 +239,67 @@
///
/// </summary>
/// <param name="roadwayNos"></param>
+ /// <param name="palletCode"></param>
+ /// <param name="heightType"></param>
+ /// <returns></returns>
+ WebResponseContent RequestWMSAssignRoadway(List<string> roadwayNos, string palletCode, int heightType);
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="roadwayNos"></param>
+ /// <param name="taskNum"></param>
+ /// <param name="heightType"></param>
+ /// <returns></returns>
+ WebResponseContent RequestWMSAssignRoadway(List<string> roadwayNos, int taskNum, int heightType);
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="roadwayNos"></param>
/// <returns></returns>
WebResponseContent RequestWMSAssignRoadway(List<string> roadwayNos);
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="agvPodModel"></param>
+ /// <param name="PodBerthAndMat"></param>
+ /// <returns></returns>
+ WebResponseContent AgvPodBerthAndMat(AgvPodBerthAndMatDTO agvPodModel, APIEnum PodBerthAndMat = APIEnum.Agv_CSJPodBerthAndMat);
+ /// <summary>
+ /// //鍒ゆ柇绉诲簱璐т綅浠诲姟鏄惁宸插瓨鍦紝濡傚瓨鍦ㄥ厛鎵ц
+ /// </summary>
+ Dt_Task QueryStackerExistTask(string PalletCode,string locationCode);
+ /// <summary>
+ /// AGV鎴愬搧鍙栨斁璐ч�氱煡
+ /// </summary>
+ WebResponseContent AgvBoxApplyPass(AGVBoxApplyPassDTO applyPassDTO, APIEnum SecureReply = APIEnum.AGV_CPBoxApplyPass);
+ /// <summary>
+ /// CTU鍙栨秷浠诲姟
+ /// </summary>
+ /// <returns></returns>
+ WebResponseContent AgvBoxApplyPass(AgvCTUCancelDTO applyPassDTO, APIEnum SecureReply = APIEnum.AGV_CTUCancelTask);
+ /// <summary>
+ /// 鐢熸垚绌烘浠诲姟
+ /// </summary>
+ WebResponseContent AgvCarrying(int row, int startColumn, int endColumn, int layer, int targetLayer);
+ /// <summary>
+ /// 棰勮皟搴︽寚浠�
+ /// </summary>
+ WebResponseContent AgvPreScheduleTask(AgvScheduleTaskDTO scheduleTaskDTO, APIEnum ScheduleTask = APIEnum.AGV_CTUScheduleTaskTask);
+
+ /// <summary>
+ /// 鎺ュ彈WMS鎵嬪姩瀹屾垚浠诲姟
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <returns></returns>
+ public WebResponseContent RecWMSTaskCompleted(int taskNum);
+ /// <summary>
+ /// 鎺ユ敹wcs浠诲姟鍙栨秷
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <returns></returns>
+ public WebResponseContent RecWMSTaskHandCancel(int taskNum);
}
}
--
Gitblit v1.9.3