From aeb971fe12b73d83d31a83b00f0a6e2876b24a00 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期四, 09 四月 2026 21:21:51 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/RuiShengZhiNeng/GaoPuLiTiKu
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs | 125 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 124 insertions(+), 1 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 62975a3..6fe4558 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"
@@ -30,6 +30,13 @@
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core.BaseRepository;
using Microsoft.AspNetCore.Mvc;
+using WIDESEAWCS_DTO.WMS;
+using WIDESEAWCS_Common;
+using WIDESEAWCS_Common.LocationEnum;
+using Microsoft.VisualBasic;
+using System.Web;
+using WIDESEAWCS_DTO.RGV.FOURBOT;
+using WIDESEAWCS_DTO.AGV.HIKROBOT;
namespace WIDESEAWCS_ITaskInfoService
{
@@ -62,6 +69,20 @@
/// <returns>杩斿洖澶勭悊缁撴灉</returns>
WebResponseContent ReceiveWMSTask([FromBody] List<WMSTasksDTO> taskDTOs);
WebResponseContent ReceiveWMSTask([NotNull] List<WMSTaskDTO> taskDTOs);
+
+ /// <summary>
+ /// 鍙栨秷浠诲姟
+ /// </summary>
+ /// <param name="wMSCancelTask">鍙栨秷浠诲姟瀹炰綋绫�</param>
+ /// <returns></returns>
+ WebResponseContent CancelWMSTask(WMSCancelTask wMSCancelTask);
+
+ /// <summary>
+ /// 淇敼浠诲姟浼樺厛绾�
+ /// </summary>
+ /// <param name="updateTaskPriority"></param>
+ /// <returns></returns>
+ WebResponseContent UpdateWMSTaskPriority(WMSUpdateTaskPriority updateTaskPriority);
/// <summary>
/// 鏍规嵁鎵樼洏鍙枫�佽捣濮嬪湴鍧�鍚慦MS璇锋眰浠诲姟
@@ -161,6 +182,12 @@
/// <param name="task">浠诲姟瀹炰綋瀵硅薄</param>
/// <returns></returns>
WebResponseContent UpdateTaskStatusToNext([NotNull] Dt_Task task);
+ /// <summary>
+ /// 涓嬪彂娴峰悍AGV浠诲姟
+ /// </summary>
+ /// <param name="task"></param>
+ /// <returns></returns>
+ WebResponseContent SendHIKROBOTTask([NotNull] Dt_Task task);
/// <summary>
/// 鏍规嵁浠诲姟鍙枫�佸綋鍓嶅湴鍧�鏇存柊浠诲姟浣嶇疆淇℃伅
@@ -183,12 +210,108 @@
/// <param name="taskNum">浠诲姟鍙�</param>
/// <returns>杩斿洖澶勭悊缁撴灉</returns>
WebResponseContent TaskStatusRecovery(int taskNum);
-
+ WebResponseContent ErrorTaskFeedback(Dt_Task dt_Task, bool Del);
/// <summary>
/// 鍥炴粴浠诲姟鐘舵��
/// </summary>
/// <param name="taskNum">浠诲姟鍙�</param>
/// <returns>杩斿洖澶勭悊缁撴灉</returns>
WebResponseContent RollbackTaskStatusToLast(int taskNum);
+ /// <summary>
+ /// 鑾峰彇浠诲姟鍙�
+ /// </summary>
+ /// <param name="sequenceName"></param>
+ /// <returns></returns>
+ int GetTaskNum(string sequenceName);
+
+
+ WebResponseContent UpdateTaskStatus(object TaskDTO, DeviceTypeEnum deviceTypeEnum);
+ /// <summary>
+ /// 淇敼璐т綅鐘舵��
+ /// </summary>
+ /// <param name="LocationCode"></param>
+ /// <param name="deviceTypeEnum"></param>
+ /// <param name="locationStatusEnum"></param>
+ /// <returns></returns>
+ WebResponseContent UpdateLocationStatus(string locationCode,string palletCode, DeviceTypeEnum deviceTypeEnum, LocationStatusEnum locationStatusEnum);
+
+
+ WebResponseContent ModifyWMSLayoutZone(WMSUpdateLocationArea wMSUpdateLocationArea);
+
+ /// <summary>
+ /// 鍖哄煙搴撲綅淇℃伅鏌ヨ
+ /// </summary>
+ /// <param name="AreaCode">鍖哄煙鍙�</param>
+ /// <returns></returns>
+ WebResponseContent LocationInquiry(WMSGetLocationInfo getLocationInfo);
+
+
+ /// <summary>
+ /// 鍦板浘鍚屾
+ /// </summary>
+ /// <param name="mapSynchronizationDto"></param>
+ /// <returns></returns>
+ public WebResponseContent MapSynchronize(MapSynchronizationDto mapSynchronizationDto);
+
+
+ /// <summary>
+ /// 鍑哄叆搴撳畬鎴�
+ /// </summary>
+ /// <param name=""></param>
+ /// <returns></returns>
+ public WebResponseContent InandoutCompleted(WMSInOutBoundCompleteFeedback wMSInOutBoundCompleteFeedback);
+
+
+ /// <summary>
+ /// 鏂欑楠岃瘉
+ /// </summary>
+ /// <param name="taskCode">浠诲姟鍙�</param>
+ /// <param name="containerCode">瀹瑰櫒缂栫爜</param>
+ /// <returns></returns>
+ public WebResponseContent MaterialBoxInspection(string taskCode ,string containerCode);
+
+ /// <summary>
+ /// 4F鎻愬崌鏈哄嚭鍙f墭鐩樺彿涓婃姤WMS
+ /// </summary>
+ /// <param name="LocationCode"></param>
+ /// <param name="containerCode"></param>
+ /// <returns></returns>
+ public WebResponseContent InboundElevatorExit(string LocationCode, string containerCode);
+
+ /// <summary>
+ /// wcs绉诲簱鏁版嵁鍥炰紶
+ /// </summary>
+ /// <param name="wMSMoveLocationFeedback"></param>
+ /// <returns></returns>
+ public WebResponseContent WcsMovingDataBack(WMSMoveLocationFeedback wMSMoveLocationFeedback);
+
+ /// <summary>
+ /// WMS瀹瑰櫒娴佸姩璇锋眰
+ /// </summary>
+ /// <param name="wMSContainerFlow"></param>
+ /// <returns></returns>
+ WebResponseContent ContainerRequest(WMSContainerFlow wMSContainerFlow);
+
+ /// <summary>
+ /// 璐ㄦ缁撴灉鍙嶉
+ /// </summary>
+ /// <param name="iQC"></param>
+ /// <returns></returns>
+ WebResponseContent IQCResult(IQCResultDTO iQC);
+
+ /// <summary>
+ /// 鎵归噺鏇存柊鍌ㄤ綅鐘舵��
+ /// </summary>
+ /// <returns></returns>
+ WebResponseContent multiSetNodeStatus(FOURBOTStorageStatusNotify fOURBOTStorageStatusNotify);
+
+
+ /// <summary>
+ /// 娴峰悍AGV浠诲姟缁х画鎵ц
+ /// </summary>
+ /// <param name="TaskCode">浠诲姟鍙�</param>
+ /// <returns></returns>
+ WebResponseContent Hikvisiontaskscontinue(string TaskCode, string Address=null);
+
}
}
--
Gitblit v1.9.3