解决冲突

刘磊

2024-12-17 58a5a9af83492c5bbb4fba88b4443f08fa4becfc

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs

@@ -58,12 +58,49 @@
        WebResponseContent ReceiveWMSTask([NotNull] List<WMSTaskDTO> taskDTOs);

        /// <summary>
        /// 接收WMS任务信息
        /// </summary>
        /// <param name="taskDTOs">WMS任务对象集合</param>
        /// <returns>返回处理结果</returns>
        WebResponseContent ReceiveByWMSTask([NotNull] WMSTaskDTO taskDTOs);

        /// <summary>
        /// 接收WMS任务信息
        /// </summary>
        /// <param name="taskDTOs">WMS任务对象集合</param>
        /// <returns>返回处理结果</returns>
        WebResponseContent ReceiveByWMSGWTask([NotNull] WMSTaskDTO taskDTO);

        /// <summary>
        /// 根据托盘号、起始地址向WMS请求任务
        /// </summary>
        /// <param name="palletCode">托盘号</param>
        /// <param name="sourceAddress">起始地址</param>
        /// <returns></returns>
        Task<WebResponseContent> RequestWMSTask(string palletCode, string sourceAddress);

        /// <summary>
        /// 请求出库至包装
        /// </summary>
        /// <param name="stationManager"></param>
        /// <returns></returns>
        Task<WebResponseContent> RequestOutTaskToBZAsync(Dt_StationManager stationManager);

        /// <summary>
        /// 根据托盘号、起始地址向WMS请求任务
        /// </summary>
        /// <param name="palletCode">托盘号</param>
        /// <param name="sourceAddress">起始地址</param>
        /// <returns></returns>
        Task<WebResponseContent> RequestTask(string palletCode, string EquiCodeMOM, string Roadways, string area,string currentChildeCode);

        /// <summary>
        /// 根据托盘号、站台向WMS请求任务
        /// </summary>
        /// <param name="palletCode">托盘号</param>
        /// <param name="sourceAddress">起始地址</param>
        /// <returns></returns>
        Task<WebResponseContent> RequestTask(string palletCode, Dt_StationManager stationManager);

        /// <summary>
        /// 根据设备编号、当前地址查询输送线未执行的任务
@@ -99,12 +136,29 @@
        Dt_Task QueryExecutingConveyorLineTask(int taskNum, string nextAddress);

        /// <summary>
        /// 根据托盘号、下一地址查询输送线执行中的任务
        /// </summary>
        /// <param name="taskNum">任务号</param>
        /// <param name="nextAddress">下一地址</param>
        /// <returns></returns>
        Dt_Task QueryExecutingTaskByBarcode(string barcode, string nextAddress);

        /// <summary>
        /// 根据任务号、当前地址查询输送线完成的任务
        /// </summary>
        /// <param name="taskNum">任务号</param>
        /// <param name="currentAddress">当前地址</param>
        /// <returns></returns>
        Dt_Task QueryCompletedConveyorLineTask(int taskNum, string currentAddress);


        /// <summary>
        /// 根据托盘号、当前地址查询任务
        /// </summary>
        /// <param name="taskNum">任务号</param>
        /// <param name="currentAddress">当前地址</param>
        /// <returns></returns>
        Dt_Task QueryBarcodeTask(string barcode, string currentAddress);

        /// <summary>
        /// 根据任务号、当前地址查询输送线新建的任务
@@ -196,6 +250,8 @@
        /// <returns>返回处理结果</returns>
        WebResponseContent StackCraneTaskCompleted(int taskNum);

        WebResponseContent StackCraneTaskCompletedByStation(int taskNum);

        /// <summary>
        /// 恢复挂起任务
        /// </summary>
@@ -209,5 +265,20 @@
        /// <param name="taskNum">任务号</param>
        /// <returns>返回处理结果</returns>
        WebResponseContent RollbackTaskStatusToLast(int taskNum);

        /// <summary>
        /// 
        /// </summary>
        /// <param name="palletCode"></param>
        /// <param name="Roadway"></param>
        /// <returns></returns>
        Dt_Task QueryTaskByPalletCode(string palletCode, string Roadway);

        /// <summary>
        /// 查询当前设备是否有移库任务
        /// </summary>
        /// <param name="deviceNo"></param>
        /// <returns></returns>
        Dt_Task QueryRelocationTask(string deviceNo);
    }
}