From db04170b01161d97decdbca1027725424e1291f1 Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Fri, 9 Dec 2022 09:22:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agv/server/impl/ZheDaAgvServiceImpl.java | 58 ++++++++++++------- 1 file changed, 36 insertions(+), 22 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java index aaa57cd..85af1d7 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java @@ -16,6 +16,7 @@ import org.nl.acs.device_driver.basedriver.empty_vehicle_stacking_position.Empty import org.nl.acs.device_driver.basedriver.hailiang_smart_plc_test.HailiangSmartplcTestDeviceDriver; import org.nl.acs.device_driver.basedriver.haokai_auto_conveyor.HaoKaiAutoConveyorDeviceDriver; import org.nl.acs.device_driver.basedriver.paint_conveyor.PaintConveyorDeviceDriver; +import org.nl.acs.device_driver.basedriver.standard_storage.StandardStorageDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; @@ -211,6 +212,9 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService { is_feedback = true; } + if (addressdevice.getDeviceDriver() instanceof StandardStorageDeviceDriver){ + is_feedback = true; + } } if ("PauseOnStation".equals(type)) { if (addressdevice.getDeviceDriver() instanceof HailiangSmartplcTestDeviceDriver) { @@ -247,6 +251,9 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService { paintConveyorDeviceDriver.writing(2); is_feedback = true; } + if (addressdevice.getDeviceDriver() instanceof StandardStorageDeviceDriver){ + is_feedback = true; + } } } @@ -315,13 +322,13 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService { } if (addressdevice.getDeviceDriver() instanceof EmptyVehicleStackingPositionDeviceDriver) { - emptyVehicleStackingPositionDeviceDriver = (EmptyVehicleStackingPositionDeviceDriver) addressdevice.getDeviceDriver(); - int number = emptyVehicleStackingPositionDeviceDriver.getNumber(); - if (number >= Integer.valueOf(str)) { - log.info("叠盘位：" + jobno + "第" + str + "上有货！"); - return null; - } - inst.setExecute_status("3"); +// emptyVehicleStackingPositionDeviceDriver = (EmptyVehicleStackingPositionDeviceDriver) addressdevice.getDeviceDriver(); +// int number = emptyVehicleStackingPositionDeviceDriver.getNumber(); +// if (number >= Integer.valueOf(str)) { +// log.info("叠盘位：" + jobno + "第" + str + "上有货！"); +// return null; +// } +// inst.setExecute_status("3"); is_feedback = true; } @@ -354,40 +361,47 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService { is_feedback = true; } + + if (addressdevice.getDeviceDriver() instanceof StandardStorageDeviceDriver){ + is_feedback = true; + } } if ("PauseOnStation".equals(type)) { if (addressdevice.getDeviceDriver() instanceof HailiangSmartplcTestDeviceDriver) { - hailiangSmartplcTestDeviceDriver = (HailiangSmartplcTestDeviceDriver) addressdevice.getDeviceDriver(); - inst.setExecute_status("4"); - hailiangSmartplcTestDeviceDriver.writing(3); +// hailiangSmartplcTestDeviceDriver = (HailiangSmartplcTestDeviceDriver) addressdevice.getDeviceDriver(); +// inst.setExecute_status("4"); +// hailiangSmartplcTestDeviceDriver.writing(3); is_feedback = true; } if (addressdevice.getDeviceDriver() instanceof EmptyVehicleStackingPositionDeviceDriver) { - emptyVehicleStackingPositionDeviceDriver = (EmptyVehicleStackingPositionDeviceDriver) addressdevice.getDeviceDriver(); - inst.setExecute_status("4"); - emptyVehicleStackingPositionDeviceDriver.writing(3); +// emptyVehicleStackingPositionDeviceDriver = (EmptyVehicleStackingPositionDeviceDriver) addressdevice.getDeviceDriver(); +// inst.setExecute_status("4"); +// emptyVehicleStackingPositionDeviceDriver.writing(3); is_feedback = true; } if (addressdevice.getDeviceDriver() instanceof CargoLiftConveyorDeviceDriver) { - cargoLiftConveyorDeviceDriver = (CargoLiftConveyorDeviceDriver) addressdevice.getDeviceDriver(); - inst.setExecute_status("4"); - cargoLiftConveyorDeviceDriver.writing(3); +// cargoLiftConveyorDeviceDriver = (CargoLiftConveyorDeviceDriver) addressdevice.getDeviceDriver(); +// inst.setExecute_status("4"); +// cargoLiftConveyorDeviceDriver.writing(3); is_feedback = true; } if (addressdevice.getDeviceDriver() instanceof HaoKaiAutoConveyorDeviceDriver) { - haoKaiAutoConveyorDeviceDriver = (HaoKaiAutoConveyorDeviceDriver) addressdevice.getDeviceDriver(); - inst.setExecute_status("4"); - haoKaiAutoConveyorDeviceDriver.writing(3); +// haoKaiAutoConveyorDeviceDriver = (HaoKaiAutoConveyorDeviceDriver) addressdevice.getDeviceDriver(); +// inst.setExecute_status("4"); +// haoKaiAutoConveyorDeviceDriver.writing(3); is_feedback = true; } if (addressdevice.getDeviceDriver() instanceof PaintConveyorDeviceDriver) { - paintConveyorDeviceDriver = (PaintConveyorDeviceDriver) addressdevice.getDeviceDriver(); - inst.setExecute_status("4"); - paintConveyorDeviceDriver.writing(3); +// paintConveyorDeviceDriver = (PaintConveyorDeviceDriver) addressdevice.getDeviceDriver(); +// inst.setExecute_status("4"); +// paintConveyorDeviceDriver.writing(3); + is_feedback = true; + } + if (addressdevice.getDeviceDriver() instanceof StandardStorageDeviceDriver){ is_feedback = true; } }