解决冲突

刘磊

2024-12-17 58a5a9af83492c5bbb4fba88b4443f08fa4becfc

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

@@ -79,6 +79,12 @@
        /// <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请求任务
@@ -130,6 +136,14 @@
        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>
@@ -137,6 +151,15 @@
        /// <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>
        /// 根据任务号、当前地址查询输送线新建的任务
        /// </summary>