diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java index 68731bb..7e98ec4 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java @@ -15,6 +15,7 @@ import org.nl.acs.device_driver.basedriver.robot_arm.RobotArmDeviceDriver; import org.nl.acs.device_driver.basedriver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; import org.nl.acs.device_driver.basedriver.stretch_wrapper.ItemProtocol; import org.nl.acs.device_driver.basedriver.stretch_wrapper.StretchWrapperDeviceDriver; +import org.nl.acs.device_driver.basedriver.weight_platform.WeightPlatformDeviceDriver; import org.nl.acs.device_driver.driver.AbstractDeviceDriver; import org.nl.acs.device_driver.storage.standard_storage.StandardStorageDeviceDriver; import org.nl.acs.ext.wms.data.one.feedBackTaskStatus.FeedBackTaskStatusRequest; @@ -206,6 +207,15 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic flag = true; } + //到达称重平台 + if (device.getDeviceDriver() instanceof WeightPlatformDeviceDriver) { + log.info("到达{}取货点开始取货", device_code); + inst.setExecute_status("1"); + instructionService.update(inst); + data = ndcAgvService.sendAgvOneModeInst(phase, index, 0); + flag = true; + } + // 到达缠绕机 if (device.getDeviceDriver() instanceof StretchWrapperDeviceDriver) { StretchWrapperDeviceDriver deviceDriver = (StretchWrapperDeviceDriver) device.getDeviceDriver(); @@ -321,6 +331,13 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic flag = true; } + //到达称重平台取货完成 + if (device.getDeviceDriver() instanceof WeightPlatformDeviceDriver) { + data = ndcAgvService.sendAgvOneModeInst(phase, index, 0); + log.info("agv进入" + device_code + "取货完成"); + flag = true; + } + // 到达缠绕机取货完成 if (device.getDeviceDriver() instanceof StretchWrapperDeviceDriver) { StretchWrapperDeviceDriver deviceDriver = (StretchWrapperDeviceDriver) device.getDeviceDriver(); @@ -405,6 +422,12 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic data = ndcAgvService.sendAgvOneModeInst(phase, index, 0); flag = true; } + // 称重平台 + if (device.getDeviceDriver() instanceof WeightPlatformDeviceDriver) { + log.info("到达{}放货点", device_code); + data = ndcAgvService.sendAgvOneModeInst(phase, index, 0); + flag = true; + } // 缠绕机 if (device.getDeviceDriver() instanceof StretchWrapperDeviceDriver) { StretchWrapperDeviceDriver deviceDriver = (StretchWrapperDeviceDriver) device.getDeviceDriver(); @@ -496,6 +519,12 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic data = ndcAgvService.sendAgvOneModeInst(phase, index, 0); flag = true; } + //称重平台放货完成 + if (device.getDeviceDriver() instanceof WeightPlatformDeviceDriver) { + log.info("{}放货完成", device_code); + data = ndcAgvService.sendAgvOneModeInst(phase, index, 0); + flag = true; + } // 到达缠绕机放货完成 if (device.getDeviceDriver() instanceof StretchWrapperDeviceDriver) { StretchWrapperDeviceDriver deviceDriver = (StretchWrapperDeviceDriver) device.getDeviceDriver();