From e0e8c8f0b0abc141b116779afbcee970e091caaf Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 05 十二月 2025 09:48:09 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/LongDeLiLiKu
---
项目代码/WCS/WCSServices/WIDESEAWCS_ITaskInfoService/ITaskService.cs | 84 ++++++++++++++++++++++--------------------
1 files changed, 44 insertions(+), 40 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 17574d3..1f44b21 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"
@@ -28,6 +28,7 @@
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_Core.Enums;
+using WIDESEAWCS_DTO;
using WIDESEAWCS_DTO.Agv;
using WIDESEAWCS_DTO.TaskInfo;
using WIDESEAWCS_Model.Models;
@@ -73,6 +74,13 @@
/// <returns></returns>
WebResponseContent RequestYLWMSTaskSimple(string palletCode, string sourceAddress, int taskNum = 0);
+ /// <summary>
+ /// 鍏ュ簱鐢宠
+ /// </summary>
+ /// <param name="palletCode">鏉＄爜</param>
+ /// <returns></returns>
+ WebResponseContent YLPurchaseBoxing(string palletCode, decimal weight = 0, decimal thickness = 0, decimal wide = 0, string stationCode="");
+
WebResponseContent AssignCPRoadwayNo();
// <summary>
@@ -88,6 +96,22 @@
/// /// <param name="roadWay">宸烽亾</param>
/// <returns></returns>
WebResponseContent RequestWMSTaskSimple(string palletCode, string sourceAddress, string roadWay="", int taskType = 630,int taskNum=0,string targetAddress="");
+ //涓婁紶鏉＄爜
+
+ WebResponseContent MESBoxCodeNotice(string boxCode);
+ /// <summary>
+ /// 鍒ゆ柇鍏佽鏀捐揣
+ /// </summary>
+ /// <returns></returns>
+ string MESAvgArriveNotice(RequestAGVArriveDTO requestAGVArriveDTO);
+
+ /// <summary>
+ /// 鍙犵洏鏈虹敵璇风┖鎵樺叆鎴愬搧搴�
+ /// </summary>
+ /// <param name="palletCode"></param>
+ /// <param name="SourceAddress"></param>
+ /// <returns></returns>
+ WebResponseContent CPEmptyInbound(string palletCode, string SourceAddress);
/// <summary>
/// 鍚慦MS鐢宠浠诲姟
@@ -107,11 +131,25 @@
string? RequestAssignLocation(int taskNum, string roadwayNo);
/// <summary>
+ /// 鍚慦MS鐢宠鍑哄簱AGV缁堢偣
+ /// </summary>
+ /// <param name="taskNum">浠诲姟鍙�</param>
+ /// <returns></returns>
+ string? RequestTargetAddress(int taskNum);
+
+ /// <summary>
/// 浠诲姟瀹屾垚
/// </summary>
/// <param name="taskNum">浠诲姟鍙�</param>
/// <returns></returns>
WebResponseContent TaskCompleted(int taskNum);
+
+ /// <summary>
+ /// 浠诲姟閲嶆柊涓嬪彂
+ /// </summary>
+ /// <param name="taskNum">浠诲姟鍙�</param>
+ /// <returns></returns>
+ WebResponseContent ResendTask(int taskNum);
/// <summary>
/// 鏍规嵁璁惧缂栧彿銆佷换鍔＄被鍨嬪垎缁�(鍙��)鎸夌収浼樺厛绾т互鍙婂垱寤烘椂闂存帓搴忔煡璇换鍔℃睜鏂板鐨勪换鍔�
@@ -180,6 +218,12 @@
/// <returns></returns>
WebResponseContent AgvSendTask(AgvTaskSendDTO taskModel, APIEnum SendTask = APIEnum.AgvSendTask);
/// <summary>
+ /// AGV纭瀹屾垚鎺ュ彛(鍙栨斁)
+ /// </summary>
+ /// <param name="agvFinishDTO"></param>
+ /// <returns></returns>
+ WebResponseContent AGVFinish(AgvFinishDTO agvFinishDTO);
+ /// <summary>
/// 瀹夊叏淇″彿鍥炲 WCS-AGV
/// </summary>
/// <param name="secureModel"></param>
@@ -193,13 +237,6 @@
AgvResponseContent AgvUpdateTask(AgvUpdateDTO agvUpdateModel);
/// <summary>
- ///
- /// </summary>
- /// <param name="taskNum"></param>
- /// <returns></returns>
- WebResponseContent SendSecureReplyToAgv(int taskNum);
-
- /// <summary>
/// 鏇存柊浠诲姟淇℃伅鍙婃坊鍔犱换鍔℃槑缁嗚褰�
/// </summary>
/// <param name="task">浠诲姟鍘熷璞″疄渚�(鏈慨鏀圭殑鏁版嵁瀵硅薄)</param>
@@ -210,39 +247,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>
///
--
Gitblit v1.9.3