From ae085f825aced1bf512e0b653d218415feeab1a1 Mon Sep 17 00:00:00 2001 From: yanps Date: Wed, 5 Feb 2025 16:13:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E5=A0=86=E5=9E=9B?= =?UTF-8?q?=E6=9C=BA,=E4=B8=8B=E5=8F=91=E4=BF=A1=E5=8F=B7=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../run/TwoNDCSocketConnectionAutoRun.java | 30 +++++++++--------- .../PaperTubeConveyor2Defination.java | 2 +- .../BeltConveyorDeviceDriver.java | 2 +- .../driver/AbstractOpcDeviceDriver.java | 6 ++-- ...ConveyorWithScannerWeightDeviceDriver.java | 31 ++++++++++--------- .../ReturnGoodManipulatorDeviceDriver.java | 1 + .../StandardStackerDeviceDriver.java | 2 ++ 7 files changed, 40 insertions(+), 34 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java b/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java index 92ee2cce9..4b622fb7a 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java @@ -184,22 +184,24 @@ public class TwoNDCSocketConnectionAutoRun extends AbstractAutoRunnable { if (ObjectUtil.isEmpty(inst)) { log.info("未找到指令号{}对应的指令", ikey); } else { - String agvcar = inst.getCarno(); - Device agvDevice = deviceAppService.findDeviceByCode(agvcar); - if (agvDevice != null) { - if (agvDevice.getDeviceDriver() instanceof AgvNdcTwoDeviceDriver) { - agvNdcTwoDeviceDriver = (AgvNdcTwoDeviceDriver) agvDevice.getDeviceDriver(); - agvNdcTwoDeviceDriver.setInstruction(null); + if("1".equals(inst.getInstruction_type()) || "2".equals(inst.getInstruction_type()) || "3".equals(inst.getInstruction_type())) { + String agvcar = inst.getCarno(); + Device agvDevice = deviceAppService.findDeviceByCode(agvcar); + if (agvDevice != null) { + if (agvDevice.getDeviceDriver() instanceof AgvNdcTwoDeviceDriver) { + agvNdcTwoDeviceDriver = (AgvNdcTwoDeviceDriver) agvDevice.getDeviceDriver(); + agvNdcTwoDeviceDriver.setInstruction(null); + } } + inst.setInstruction_status("2"); + try { + instructionService.finish(inst); + } catch (Exception e) { + e.printStackTrace(); + } + // ndc会向A1和A2都上报反馈任务完成 + data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); } - inst.setInstruction_status("2"); - try { - instructionService.finish(inst); - } catch (Exception e) { - e.printStackTrace(); - } - // ndc会向A1和A2都上报反馈任务完成 - data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); } } //请求删除任务 diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device2/PaperTubeConveyor2Defination.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device2/PaperTubeConveyor2Defination.java index 5ae32d885..81cad24b8 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device2/PaperTubeConveyor2Defination.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device2/PaperTubeConveyor2Defination.java @@ -11,7 +11,7 @@ import java.util.LinkedList; import java.util.List; /** - * 油漆线 + * 纸管库 */ @Service public class PaperTubeConveyor2Defination implements OpcDeviceDriverDefination { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java index cf4374aed..8134df794 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java @@ -320,7 +320,7 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements } break; case 3: - log.info("运行中"); + log.info(this.device_code + ",运行中"); break; case 4: //申请出货 diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/AbstractOpcDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/AbstractOpcDeviceDriver.java index 25ab93301..77aeebbcf 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/AbstractOpcDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/AbstractOpcDeviceDriver.java @@ -39,8 +39,8 @@ public class AbstractOpcDeviceDriver extends AbstractDeviceDriver implements Opc public void checkcontrol(Map itemValues) throws Exception { Group group; try { - group = opcServerService.getServer(this.getOpcServer()); - }catch (Exception e){ + group = opcServerService.getServer(this.getOpcServer()); + } catch (Exception e) { e.printStackTrace(); group = opcServerService.getServer(this.getOpcServer()); } @@ -125,7 +125,7 @@ public class AbstractOpcDeviceDriver extends AbstractDeviceDriver implements Opc } if (i >= 2) { - log.info("写入次数超过3次而失败"); + log.info(itemValues + "写入次数超过3次而失败"); throw new RuntimeException("写入次数超过3次而失败"); } ++i; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java index 36938cf89..57c1bedea 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java @@ -183,7 +183,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv private int instruction_require_time_out = 3000; private int require_apply_mxrk_time_out = 4000; private int require_apply_tprk_time_out = 4000; - private int require_apply_zjrk_time_out = 4000; + private int require_apply_zjrk_time_out = 4000; private int require_apply_thrk_time_out = 4000; //行架机械手申请任务成功标识 boolean requireSucess = false; @@ -349,20 +349,20 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv //申请空托盘入库 if (mode == 9 && move == 1 && !requireSucess) { - if (container_type == 0 || StrUtil.isEmpty(barcode)) { - message = "托盘类型为空"; - } else { - applyEmptyTask(StorageTypeEnum.DISKS_IN.getType(), mode); - } + if (container_type == 0 || StrUtil.isEmpty(barcode)) { + message = "托盘类型为空"; + } else { + applyEmptyTask(StorageTypeEnum.DISKS_IN.getType(), mode); + } } //申请退货入库 if (mode == 18 && move == 1 && !requireSucess) { - if (StrUtil.isEmpty(barcode) || StrUtil.isEmpty(material_barcode)) { - message = "托盘条码为空或者木箱号为空"; - } else { - applyBoxReturnTask(StorageTypeEnum.BOX_RETURN.getType(), mode); - } + if (StrUtil.isEmpty(barcode) || StrUtil.isEmpty(material_barcode)) { + message = "托盘条码为空或者木箱号为空"; + } else { + applyBoxReturnTask(StorageTypeEnum.BOX_RETURN.getType(), mode); + } } //申请高度 @@ -410,6 +410,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv } } catch (Exception e) { this.iserror = true; + log.error("空指针:{}", e); String extracted = DeviceErrorUtil.extracted(e); LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) @@ -729,7 +730,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv String body = httpResponse.body(); jsonObject = JSONObject.parseObject(body); } - log.info("wms反馈结果:{}",jsonObject); + log.info("wms反馈结果:{}", jsonObject); message = "木箱、子卷入库申请入库任务,返回参数:" + jsonObject; LuceneLogDto logDto3 = LuceneLogDto.builder() .device_code(device_code) @@ -749,7 +750,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv map.put("code", "to_command"); map.put("value", mode); list1.add(map); - log.error("下发电气--------:{}",map); + log.error("下发电气--------:{}", map); this.writing(list1); requireSucess = true; } else { @@ -799,7 +800,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv String body = httpResponse.body(); jsonObject = JSONObject.parseObject(body); } - log.info("wms反馈结果:{}",jsonObject); + log.info("wms反馈结果:{}", jsonObject); message = "木箱、子卷入库申请入库任务,返回参数:" + jsonObject; LuceneLogDto logDto3 = LuceneLogDto.builder() .device_code(device_code) @@ -819,7 +820,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv map.put("code", "to_command"); map.put("value", mode); list1.add(map); - log.error("下发电气--------:{}",map); + log.error("下发电气--------:{}", map); this.writing(list1); requireSucess = true; } else { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ReturnGoodManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ReturnGoodManipulatorDeviceDriver.java index 556dbaa80..9bc11527a 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ReturnGoodManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ReturnGoodManipulatorDeviceDriver.java @@ -229,6 +229,7 @@ public class ReturnGoodManipulatorDeviceDriver extends AbstractOpcDeviceDriver i } catch (Exception e) { this.iserror = true; + log.error("空指针:{}",e); String extracted = DeviceErrorUtil.extracted(e); LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java index 2cd4c7dc4..9fead9f26 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java @@ -1046,7 +1046,9 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme "有货或未联机,无法下发指令!指令号:" + inst.getInstruction_code(); return false; } + log.info(next_device_code + "设备mode:" + beltConveyorDeviceDriver.getMode() + ",move:" + beltConveyorDeviceDriver.getMove()); } + List list = new ArrayList(); pakageCommand(list, inst.getInstruction_code()); packagePlcCoordinate(startDevice, list, "1");