Merge branch 'master' of http://115.159.85.185:8098/r/RuiShengZhiNeng/GaoPu...

yanjinhui

6 天以前 aeb971fe12b73d83d31a83b00f0a6e2876b24a00

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs

@@ -32,6 +32,11 @@
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
{
@@ -70,14 +75,14 @@
        /// </summary>
        /// <param name="wMSCancelTask">取消任务实体类</param>
        /// <returns></returns>
        public WebResponseContent CancelWMSTask(WMSCancelTask wMSCancelTask);
         WebResponseContent CancelWMSTask(WMSCancelTask wMSCancelTask);

        /// <summary>
        /// ä¿®æ”¹ä»»åŠ¡ä¼˜å…ˆçº§
        /// </summary>
        /// <param name="updateTaskPriority"></param>
        /// <returns></returns>
        public WebResponseContent UpdateWMSTaskPriority(WMSUpdateTaskPriority updateTaskPriority);
         WebResponseContent UpdateWMSTaskPriority(WMSUpdateTaskPriority updateTaskPriority);

        /// <summary>
        /// æ ¹æ®æ‰˜ç›˜å·ã€èµ·å§‹åœ°å€å‘WMS请求任务
@@ -177,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>
        /// æ ¹æ®ä»»åŠ¡å·ã€å½“前地址更新任务位置信息
@@ -199,7 +210,7 @@
        /// <param name="taskNum">任务号</param>
        /// <returns>返回处理结果</returns>
        WebResponseContent TaskStatusRecovery(int taskNum);

        WebResponseContent ErrorTaskFeedback(Dt_Task dt_Task, bool Del);
        /// <summary>
        /// å›žæ»šä»»åŠ¡çŠ¶æ€
        /// </summary>
@@ -212,6 +223,95 @@
        /// <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提升机出口托盘号上报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);
      
    }
}