新增托盘号查询功能并优化异常处理在 `ITaskService.cs` 中添加了 `QueryExecutingConveyorLineTask` 方...

huangxiaoqiang

3 天以前 4d0ae22c1311f7d947c17ad986a5b1c91afd3ced

新增托盘号查询功能并优化异常处理在 `ITaskService.cs` 中添加了 `QueryExecutingConveyorLineTask` 方法，支持根据托盘号和下一地址查询输送线执行中的任务。更新了 `TaskService.cs` 中的方法实现，保留原有查询功能并增强查询逻辑。在 `CommonConveyorLine_GWJob.cs` 中修改了 `ConveyorLineOutFinish` 方法，整合新查询逻辑并清理了注释代码。同时，增加了异常处理机制，提升了代码的健壮性。

 CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs

@@ -149,6 +149,13 @@
        /// <param name="nextAddress">下一地址</param>
        /// <returns></returns>
        Dt_Task QueryExecutingConveyorLineTask(int taskNum, string nextAddress,string Barcode);
        /// <summary>
        /// 根据托盘号、下一地址查询输送线执行中的任务
        /// </summary>
        /// <param name="taskNum">任务号</param>
        /// <param name="nextAddress">下一地址</param>
        /// <returns></returns>
        Dt_Task QueryExecutingConveyorLineTask(string nextAddress, string Barcode);

        /// <summary>
        /// 根据托盘号、下一地址查询输送线执行中的任务

 CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs

@@ -339,6 +339,16 @@
        {
            return BaseDal.QueryFirst(x => x.TaskNum == taskNum && x.NextAddress == nextAddress && (x.TaskState == (int)TaskInStatusEnum.Line_InExecuting || x.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting) && x.PalletCode == Barcode, TaskOrderBy);
        }
        /// <summary>
        /// 根据托盘号、下一地址查询输送线执行中的任务
        /// </summary>
        /// <param name="taskNum">任务号</param>
        /// <param name="nextAddress">下一地址</param>
        /// <returns></returns>
        public Dt_Task QueryExecutingConveyorLineTask(string nextAddress, string Barcode)
        {
            return BaseDal.QueryFirst(x => (x.NextAddress == nextAddress || x.TargetAddress == nextAddress) && (x.TaskState == (int)TaskInStatusEnum.Line_InExecuting || x.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting) && x.PalletCode == Barcode, TaskOrderBy);
        }

        /// <summary>
        /// 根据任务号、当前地址查询输送线完成的任务

 CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/CommonConveyorLine_GWJob.cs

@@ -399,7 +399,12 @@
        {
            try
            {
                //var task = _taskService.QueryExecutingConveyorLineTask(command.ConveyorLineTaskNum, childDeviceCode);
                var log = $"【{conveyorLine.DeviceName}】托盘号：【{command.ConveyorLineBarcode}】任务号：【{command.ConveyorLineTaskNum}】设备编码：【{childDeviceCode}】";
                ConsoleHelper.WriteSuccessLine(log);

                _noticeService.Logs(userTokenIds, new { conveyorLine.DeviceName, log = log, time = DateTime.Now.ToString("G"), color = "red" });
                WriteInfo(conveyorLine.DeviceName, log);

                var task = _taskService.QueryExecutingConveyorLineTask(command.ConveyorLineTaskNum, childDeviceCode, command.ConveyorLineBarcode);
                if (task != null)
                {
@@ -409,13 +414,10 @@
                    Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.stationPLC == conveyorLine.DeviceCode && x.stationChildCode == childDeviceCode);
                    if (task.PalletCode != command.ConveyorLineBarcode)
                    {
                        //var NGAddress = _platFormRepository.QueryFirst(x => x.PlatCode == task.TargetAddress).Capacity;
                        //taskCommand.ConveyorLineTargetAddress = (short)NGAddress;
                        taskCommand.ConveyorLineTargetAddress = Convert.ToInt16(stationManager.stationNGChildCode);
                    }
                    else
                    {
                        //Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.stationPLC == conveyorLine.DeviceCode && x.stationChildCode == childDeviceCode);
                        taskCommand.ConveyorLineTargetAddress = Convert.ToInt16(stationManager.stationLocation);
                    }

@@ -445,9 +447,54 @@
                    conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineTargetAddress, taskCommand.ConveyorLineTargetAddress, childDeviceCode);
                    conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineBarcode, taskCommand.ConveyorLineBarcode, childDeviceCode);
                    conveyorLine.Communicator.Write(address, 1);
                    //conveyorLine.SetValue(ConveyorLineDBName_After.InteractiveSignal, taskCommand.InteractiveSignal, childDeviceCode);
                    //conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, 1, childDeviceCode);
                    WriteInfo($"{conveyorLine.DeviceName}输送线出库完成", $"子节点【{childDeviceCode}】托盘号：【{command.ConveyorLineBarcode}】");
                }
                else
                {
                    var taskNext = _taskService.QueryExecutingConveyorLineTask(childDeviceCode, command.ConveyorLineBarcode);
                    if (taskNext != null)
                    {
                        WebResponseContent content = new WebResponseContent();
                        ConveyorLineTaskCommand_After taskCommand = _mapper.Map<ConveyorLineTaskCommand_After>(taskNext);
                        taskCommand.InteractiveSignal = command.InteractiveSignal;
                        Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.stationPLC == conveyorLine.DeviceCode && x.stationChildCode == childDeviceCode);
                        if (taskNext.PalletCode != command.ConveyorLineBarcode)
                        {
                            taskCommand.ConveyorLineTargetAddress = Convert.ToInt16(stationManager.stationNGChildCode);
                        }
                        else
                        {
                            taskCommand.ConveyorLineTargetAddress = Convert.ToInt16(stationManager.stationLocation);
                        }

                        if (stationManager.stationPLC == "1007" && stationManager.stationArea == "Cache")  //更新在途数据
                        {
                            dt_needBarcode needBarcode = _needBarcodeRepository.QueryFirst(x => x.productLine == stationManager.productLine && x.toArea == stationManager.stationChildCode);

                            if (needBarcode != null)
                            {
                                if (needBarcode.inLineNum == 0 || needBarcode.inLineNum > 0)
                                {
                                    needBarcode.inLineNum = 0;
                                }
                                else
                                {
                                    needBarcode.inLineNum--;
                                }
                                _needBarcodeRepository.UpdateData(needBarcode);
                            }
                        }
                        content = _taskService.UpdateTaskStatusToNext(task);
                        var proAddress = conveyorLine.DeviceProDTOs
                                        .FirstOrDefault(x => x.DeviceChildCode == childDeviceCode && x.DeviceProParamName == ConveyorLineDBName_After.InteractiveSignal.ToString())
                                        ?.DeviceProAddress;
                        string address = proAddress.Contains(".0") ? proAddress : proAddress + ".0";
                        conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineTaskNum, taskCommand.ConveyorLineTaskNum, childDeviceCode);
                        conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineTargetAddress, taskCommand.ConveyorLineTargetAddress, childDeviceCode);
                        conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineBarcode, taskCommand.ConveyorLineBarcode, childDeviceCode);
                        conveyorLine.Communicator.Write(address, 1);
                        WriteInfo($"{conveyorLine.DeviceName}输送线出库完成", $"子节点【{childDeviceCode}】托盘号：【{command.ConveyorLineBarcode}】");
                    }
                }
            }
            catch (Exception ex)
@@ -455,22 +502,6 @@
                WriteInfo($"{conveyorLine.DeviceName}输送线出库完成", $"异常信息【{JsonConvert.SerializeObject(ex.Message)}】,子节点【{childDeviceCode}】托盘号：【{command.ConveyorLineBarcode}】");
            }
        }

        /// <summary>
        /// 输送线交互完成
        /// </summary>
        /// <param name="conveyorLine">输送线实例对象</param>
        /// <param name="childDeviceCode">子设备编号</param>
        /// <param name="ProtocalDetailValue">线体当前bool读取偏移地址</param>
        /// <param name="value">值</param>
        //public void ConveyorLineSendFinish(CommonConveyorLine conveyorLine, string childDeviceCode, int ProtocalDeValue, bool value)
        //{
        //    DeviceProDTO? devicePro = conveyorLine.DeviceProDTOs.Where(x => x.DeviceProParamType == nameof(DeviceCommand) && x.DeviceChildCode == childDeviceCode).OrderBy(x => x.DeviceProOffset).FirstOrDefault();
        //    string[] x = devicePro.DeviceProAddress.Split('.');
        //    x[x.Length - 1] = (ProtocalDetailValue + 1).ToString();
        //    string DeviceProAddress = string.Join(".", x);
        //    conveyorLine.Communicator.Write(DeviceProAddress, value);
        //}

        /// <summary>
        /// 监测空托盘实盘出库