diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java index 70fd97c49..af398b9e6 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java @@ -243,34 +243,34 @@ public class TwoNDCSocketConnectionAutoRun extends AbstractAutoRunnable { if (ObjectUtil.isNotEmpty(device)) { if (device.getDeviceDriver() instanceof StandardAutodoorDeviceDriver) { standardAutodoorDeviceDriver = (StandardAutodoorDeviceDriver) device.getDeviceDriver(); - String region = (String) standardAutodoorDeviceDriver.getDevice().getExtraValue().get("region"); - if (StrUtil.isNotEmpty(region) && !(" ".equals(region))) { - String linkDeviceCode = (String) standardAutodoorDeviceDriver.getDevice().getExtraValue().get("link_device_code"); - Device deviceByCode = deviceAppService.findDeviceByCode(linkDeviceCode); - if (ObjectUtil.isNotEmpty(deviceByCode) && deviceByCode.getDeviceDriver() instanceof OvenGantryManipulatorDeviceDriver) { - OvenGantryManipulatorDeviceDriver hxhj = (OvenGantryManipulatorDeviceDriver) deviceByCode.getDeviceDriver(); - String s = Integer.parseInt(region) == 1 ? "one" : Integer.parseInt(region) == 2 ? - "two" : Integer.parseInt(region) == 3 ? "three" : null; - Class aClass = hxhj.getClass(); - String regionCode = "region_" + s; - String s1 = Integer.parseInt(region) == 1 ? "2" : Integer.parseInt(region) == 2 ? - "6" : Integer.parseInt(region) == 3 ? "8" : null; - if (StrUtil.isNotEmpty(s) && ((Integer) aClass.getField(regionCode).get(hxhj) == 0)) { - hxhj.writing("to_"+regionCode, s1); - log.info("下发AGV进入区域{}信号值为:{}", region, s1); - } else { - log.info("区域{}信号{}未清除,导致不满足下发AGV进入区域信号", region, regionCode); - } - if (hxhj.getMode() == 2 && StrUtil.isNotEmpty(s1) && ((Integer) aClass.getField(regionCode).get(hxhj) == 2)) { - data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); - requireSucessRegion = true; - } else { - log.error("AGV进入区域{}信号{}行架未接收{},请检查;或行架正在执行中:{}", region, regionCode,s1, hxhj.getMode()); - } - } else { - log.error("未设置关联设备或关联的不是烘箱行架设备{}导致信号未反馈", linkDeviceCode); - } - } else { +// String region = (String) standardAutodoorDeviceDriver.getDevice().getExtraValue().get("region"); +// if (StrUtil.isNotEmpty(region) && !(" ".equals(region))) { +// String linkDeviceCode = (String) standardAutodoorDeviceDriver.getDevice().getExtraValue().get("link_device_code"); +// Device deviceByCode = deviceAppService.findDeviceByCode(linkDeviceCode); +// if (ObjectUtil.isNotEmpty(deviceByCode) && deviceByCode.getDeviceDriver() instanceof OvenGantryManipulatorDeviceDriver) { +// OvenGantryManipulatorDeviceDriver hxhj = (OvenGantryManipulatorDeviceDriver) deviceByCode.getDeviceDriver(); +// String s = Integer.parseInt(region) == 1 ? "one" : Integer.parseInt(region) == 2 ? +// "two" : Integer.parseInt(region) == 3 ? "three" : null; +// Class aClass = hxhj.getClass(); +// String regionCode = "region_" + s; +// String s1 = Integer.parseInt(region) == 1 ? "2" : Integer.parseInt(region) == 2 ? +// "6" : Integer.parseInt(region) == 3 ? "8" : null; +// if (StrUtil.isNotEmpty(s) && ((Integer) aClass.getField(regionCode).get(hxhj) == 0)) { +// hxhj.writing("to_"+regionCode, s1); +// log.info("下发AGV进入区域{}信号值为:{}", region, s1); +// } else { +// log.info("区域{}信号{}未清除,导致不满足下发AGV进入区域信号", region, regionCode); +// } +// if (hxhj.getMode() == 2 && StrUtil.isNotEmpty(s1) && ((Integer) aClass.getField(regionCode).get(hxhj) == 2)) { +// data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); +// requireSucessRegion = true; +// } else { +// log.error("AGV进入区域{}信号{}行架未接收{},请检查;或行架正在执行中:{}", region, regionCode,s1, hxhj.getMode()); +// } +// } else { +// log.error("未设置关联设备或关联的不是烘箱行架设备{}导致信号未反馈", linkDeviceCode); +// } +// } else { try { standardAutodoorDeviceDriver.writing("to_open", "1"); standardAutodoorDeviceDriver.writing("to_close", "0"); @@ -285,7 +285,7 @@ public class TwoNDCSocketConnectionAutoRun extends AbstractAutoRunnable { log.info("未下发NDC信号原因: 下发开门信号值为:{},下发关门信号值为:{}", standardAutodoorDeviceDriver.getToOpen(), standardAutodoorDeviceDriver.getToClose()); } } - } +// } } else { log.info(agvaddr + "对应设备号为空!"); } @@ -298,37 +298,37 @@ public class TwoNDCSocketConnectionAutoRun extends AbstractAutoRunnable { if (ObjectUtil.isNotEmpty(device)) { if (device.getDeviceDriver() instanceof StandardAutodoorDeviceDriver) { standardAutodoorDeviceDriver = (StandardAutodoorDeviceDriver) device.getDeviceDriver(); - String region = (String) standardAutodoorDeviceDriver.getDevice().getExtraValue().get("region"); - if (StrUtil.isNotEmpty(region) && !(" ".equals(region))) { - String linkDeviceCode = (String) standardAutodoorDeviceDriver.getDevice().getExtraValue().get("link_device_code"); - if(requireSucessTake || requireSucessPut){ - Device deviceByCode = deviceAppService.findDeviceByCode(linkDeviceCode); - if (ObjectUtil.isNotEmpty(deviceByCode) && deviceByCode.getDeviceDriver() instanceof OvenGantryManipulatorDeviceDriver) { - OvenGantryManipulatorDeviceDriver hxhj = (OvenGantryManipulatorDeviceDriver) deviceByCode.getDeviceDriver(); - String s = Integer.parseInt(region) == 1 ? "one" : Integer.parseInt(region) == 2 ? - "two" : Integer.parseInt(region) == 3 ? "three" : null; - Class aClass = hxhj.getClass(); - String regionCode = "region_" + s; - if (StrUtil.isNotEmpty(s) && ((Integer) aClass.getField(regionCode).get(hxhj) != 0)) { - hxhj.writing("to_"+regionCode, "0"); - log.info("下发AGV离开区域{}信号值为:{}", region, 0); - } else { - log.info("区域{}信号{}为0,不需要下发AGV离开区域信号", region, regionCode); - } - if (hxhj.getMode() == 2 && ((Integer) aClass.getField(regionCode).get(hxhj) == 0)) { - data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); - requireSucessPut = false; - requireSucessTake = false; - } else { - log.error("AGV离开区域{}信号{}行架未接收0,请检查;或行架正在执行中:{}", region, regionCode, hxhj.getMode()); - } - } else { - log.error("未设置关联设备或关联的不是烘箱行架设备{}导致信号未反馈", linkDeviceCode); - } - }else{ - data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); - } - } else { +// String region = (String) standardAutodoorDeviceDriver.getDevice().getExtraValue().get("region"); +// if (StrUtil.isNotEmpty(region) && !(" ".equals(region))) { +// String linkDeviceCode = (String) standardAutodoorDeviceDriver.getDevice().getExtraValue().get("link_device_code"); +// if(requireSucessTake || requireSucessPut){ +// Device deviceByCode = deviceAppService.findDeviceByCode(linkDeviceCode); +// if (ObjectUtil.isNotEmpty(deviceByCode) && deviceByCode.getDeviceDriver() instanceof OvenGantryManipulatorDeviceDriver) { +// OvenGantryManipulatorDeviceDriver hxhj = (OvenGantryManipulatorDeviceDriver) deviceByCode.getDeviceDriver(); +// String s = Integer.parseInt(region) == 1 ? "one" : Integer.parseInt(region) == 2 ? +// "two" : Integer.parseInt(region) == 3 ? "three" : null; +// Class aClass = hxhj.getClass(); +// String regionCode = "region_" + s; +// if (StrUtil.isNotEmpty(s) && ((Integer) aClass.getField(regionCode).get(hxhj) != 0)) { +// hxhj.writing("to_"+regionCode, "0"); +// log.info("下发AGV离开区域{}信号值为:{}", region, 0); +// } else { +// log.info("区域{}信号{}为0,不需要下发AGV离开区域信号", region, regionCode); +// } +// if (hxhj.getMode() == 2 && ((Integer) aClass.getField(regionCode).get(hxhj) == 0)) { +// data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); +// requireSucessPut = false; +// requireSucessTake = false; +// } else { +// log.error("AGV离开区域{}信号{}行架未接收0,请检查;或行架正在执行中:{}", region, regionCode, hxhj.getMode()); +// } +// } else { +// log.error("未设置关联设备或关联的不是烘箱行架设备{}导致信号未反馈", linkDeviceCode); +// } +// }else{ +// data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); +// } +// } else { try { standardAutodoorDeviceDriver.writing("to_close", "1"); standardAutodoorDeviceDriver.writing("to_open", "0"); @@ -338,7 +338,7 @@ public class TwoNDCSocketConnectionAutoRun extends AbstractAutoRunnable { } data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); } - } +// } } else { log.info(device_code + "对应设备号为空!"); }