From 9ae0890dd74771ba9edd44d4830e0de37f8d9938 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 26 九月 2025 16:55:03 +0800
Subject: [PATCH] MES接口优化，老厂排程优化等
---
项目代码/WCS/WCSServices/WIDESEAWCS_ITaskInfoService/ITaskService.cs | 121 ++++++++++++++++++---------------------
1 files changed, 56 insertions(+), 65 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_ITaskInfoService/ITaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
index 4aab91b..fba8617 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
@@ -71,7 +71,22 @@
/// <param name="palletCode">鎵樼洏</param>
/// <param name="sourceAddress">璧风偣</param>
/// <returns></returns>
- WebResponseContent RequestYLWMSTaskSimple(string palletCode, string sourceAddress);
+ WebResponseContent RequestYLWMSTaskSimple(string palletCode, string sourceAddress, int taskNum = 0);
+
+ /// <summary>
+ /// 鍏ュ簱鐢宠
+ /// </summary>
+ /// <param name="palletCode">鏉＄爜</param>
+ /// <returns></returns>
+ WebResponseContent YLPurchaseBoxing(string palletCode);
+
+ WebResponseContent AssignCPRoadwayNo();
+
+ // <summary>
+ /// 璇锋眰鍘熸枡鍏ュ簱宸烽亾
+ /// </summary>
+ /// <returns></returns>
+ WebResponseContent AssignYLRoadwayNo(string palletCode);
/// <summary>
/// 璇锋眰鍏ュ簱浠诲姟
/// </summary>
@@ -79,7 +94,15 @@
/// <param name="sourceAddress">璧峰鍦板潃</param>
/// /// <param name="roadWay">宸烽亾</param>
/// <returns></returns>
- WebResponseContent RequestWMSTaskSimple(string palletCode, string sourceAddress, string roadWay="", int taskType = 630);
+ WebResponseContent RequestWMSTaskSimple(string palletCode, string sourceAddress, string roadWay="", int taskType = 630,int taskNum=0,string targetAddress="");
+
+ /// <summary>
+ /// 鍙犵洏鏈虹敵璇风┖鎵樺叆鎴愬搧搴�
+ /// </summary>
+ /// <param name="palletCode"></param>
+ /// <param name="SourceAddress"></param>
+ /// <returns></returns>
+ WebResponseContent CPEmptyInbound(string palletCode, string SourceAddress);
/// <summary>
/// 鍚慦MS鐢宠浠诲姟
@@ -91,31 +114,12 @@
//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鐢宠鍒嗛厤璐т綅
/// </summary>
/// <param name="taskNum">浠诲姟鍙�</param>
/// <param name="roadwayNo">宸烽亾鍙�</param>
/// <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>
/// 浠诲姟瀹屾垚
@@ -204,13 +208,6 @@
AgvResponseContent AgvUpdateTask(AgvUpdateDTO agvUpdateModel);
/// <summary>
- ///
- /// </summary>
- /// <param name="taskNum"></param>
- /// <returns></returns>
- WebResponseContent SendSecureReplyToAgv(int taskNum);
-
- /// <summary>
/// 鏇存柊浠诲姟淇℃伅鍙婃坊鍔犱换鍔℃槑缁嗚褰�
/// </summary>
/// <param name="task">浠诲姟鍘熷璞″疄渚�(鏈慨鏀圭殑鏁版嵁瀵硅薄)</param>
@@ -221,39 +218,6 @@
/// <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 = "", string roadwayNo = "", int heightType = 0);
-
- /// <summary>
- /// 璇锋眰鍒嗛厤宸烽亾
- /// </summary>
- /// <param name="taskNum"></param>
- /// <param name="roadwayNos"></param>
- /// <returns></returns>
- WebResponseContent RequestWMSAssignRoadway(int taskNum, List<string> roadwayNos);
-
- /// <summary>
- ///
- /// </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>
///
@@ -276,10 +240,6 @@
/// <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);
@@ -290,5 +250,36 @@
/// <param name="taskNum"></param>
/// <returns></returns>
public WebResponseContent RecWMSTaskCompleted(int taskNum);
+
+ /// <summary>
+ /// 鏍规嵁鎵樼洏鍙枫�佸綋鍓嶅湴鍧�鏌ヨAGV瀹屾垚鐨勪换鍔�
+ /// </summary>
+ /// <param name="Barcode">鎵樼洏鍙�</param>
+ /// <param name="currentAddress">褰撳墠鍦板潃</param>
+ /// <returns></returns>
+ Dt_Task QueryBarCodeAGVFinishTask(int TaskNum, string currentAddress);
+
+ /// <summary>
+ /// 鏍规嵁鎵樼洏鍙枫�佷笅涓�鍦板潃鏌ヨ杈撻�佺嚎鎵ц涓殑浠诲姟
+ /// </summary>
+ /// <param name="taskNum">浠诲姟鍙�</param>
+ /// <param name="nextAddress">涓嬩竴鍦板潃</param>
+ /// <returns></returns>
+ Dt_Task QueryExecutingTaskByBarcode(int TaskNum, string nextAddress);
+
+ /// <summary>
+ /// 鏍规嵁鎵樼洏鍙枫�佷笅涓�鍦板潃鏌ヨ杈撻�佺嚎寰呮墽琛岀殑浠诲姟
+ /// </summary>
+ /// <param name="taskNum">浠诲姟鍙�</param>
+ /// <param name="nextAddress">涓嬩竴鍦板潃</param>
+ /// <returns></returns>
+ Dt_Task QueryLineExecuteTaskByBarcode(int TaskNum, string nextAddress);
+
+ /// <summary>
+ /// 灏嗕换鍔＄姸鎬佷慨鏀逛负涓嬩竴涓姸鎬�
+ /// </summary>
+ /// <param name="task">浠诲姟瀹炰綋瀵硅薄</param>
+ /// <returns></returns>
+ WebResponseContent UpdateTaskStatusToNext([NotNull] Dt_Task task, Dt_StationManger stationManger = null);
}
}
--
Gitblit v1.9.3