From d59b540dd78d49ddf1f2e1c6dfb7b19a7d3e3d7c Mon Sep 17 00:00:00 2001 From: 肖洋 <cathay_xy@163.com> Date: 星期日, 19 一月 2025 11:19:24 +0800 Subject: [PATCH] 优化代码结构和错误处理 --- Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs | 53 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 46 insertions(+), 7 deletions(-) diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs index a99a5d4..ca89b74 100644 --- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs +++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs @@ -175,13 +175,13 @@ // command.ConveyorLineBarcode = taskGW.PalletCode; //} //} - //濡傞珮娓╁嚭搴撳悗浠诲姟鏍囪NG寮傚父鍒欏皢浠诲姟鏇存柊涓哄紓甯告帓鍑轰换鍔� - Dt_Task NGtask = _taskRepository.QueryFirst(x => x.Remark == "NG" && x.Roadway == stationManager.Roadway && x.Roadway.Contains("GW")); - if (NGtask != null) - { - CreateAbNormalOutbound(conveyorLine, command, childDeviceCode, NGtask); - break; - } + //濡傞珮娓╁嚭搴撳悗浠诲姟鏍囪NG寮傚父鍒欏皢浠诲姟鏇存柊涓哄紓甯告帓鍑轰换鍔� --鍐犲畤鍙栨秷瓒呮椂妫�娴嬪悗 鎵樼洏瓒呮椂涓嶅湪鍑哄簱鑷冲紓甯稿彛 + //Dt_Task NGtask = _taskRepository.QueryFirst(x => x.Remark == "NG" && x.Roadway == stationManager.Roadway && x.Roadway.Contains("GW")); + //if (NGtask != null) + //{ + // CreateAbNormalOutbound(conveyorLine, command, childDeviceCode, NGtask); + // break; + //} RequestWmsTask(conveyorLine, command, childDeviceCode); break; @@ -238,6 +238,29 @@ { if (command.ConveyorLineBarcode != "NoRead") { + //var config = _sys_ConfigService.GetByConfigKey("SYS_BASE", "ISFRINTRAY"); + //if (config.ConfigValue == "1") + //{ + // Random random = new Random(); + // var task = new Dt_Task() + // { + // CurrentAddress = childDeviceCode, + // Grade = 1, + // NextAddress = "2066", + // PalletCode = command.ConveyorLineBarcode, + // Roadway = "FR", + // SourceAddress = childDeviceCode, + // TargetAddress = "2066", + // TaskNum = random.Next(1,9999), + // TaskType = (int)TaskInboundTypeEnum.InTray, + // TaskState = (int)TaskInStatusEnum.Line_InExecuting, + // WMSId = 0 + // }; + // var taskCommand = MapTaskCommand(task, command); + // conveyorLine.SendCommand(taskCommand, childDeviceCode); + //} + //else + //{ var taskDTO = CreateEmptyTrayTaskDto(command.ConveyorLineBarcode, childDeviceCode); if (_taskRepository.QueryFirst(x => x.PalletCode == taskDTO.PalletCode) != null) @@ -258,6 +281,7 @@ _taskService.UpdateTaskStatusToNext(task); } } + //} } } @@ -362,6 +386,21 @@ { Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.stationChildCode == childDeviceCode && x.stationPLC == conveyorLine.DeviceCode); + if (command.ConveyorLineBarcode.IsNullOrEmpty()) + { + conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, 2, childDeviceCode); + return; + } + + + if (conveyorLine.ReadValue(ConveyorLineDBName_After.InteractiveSignal, childDeviceCode).ObjToInt() == 0) //鎵樼洏姝e弽淇″彿 + { + + }; + + conveyorLine.ReadValue(ConveyorLineDBName_After.InteractiveSignal, childDeviceCode); //鎵樼洏鏈夋棤鐢佃姱淇″彿 + + } -- Gitblit v1.9.3