diff --git a/acs2/nladmin-system/pom.xml b/acs2/nladmin-system/pom.xml index 17c1f36..b5d06ef 100644 --- a/acs2/nladmin-system/pom.xml +++ b/acs2/nladmin-system/pom.xml @@ -423,7 +423,7 @@ org.bouncycastle bcprov-jdk15on - 1.70 + 1.68 diff --git a/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java b/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java index 60ee8b5..980d1e5 100644 --- a/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java +++ b/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java @@ -199,7 +199,13 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { if (driver.getAction() == XgAgvEnum.GS_ACTION_YES.getCode()) { // 判断是否清楚车号 if (device.getExtraValue().get("is_clean").toString().equals("1")) { + // 清除第当前设备车号(第二次) driver.setCar_no(""); + // 清除第一次光栅车号 + String device_code2 = device.getDevice_code().substring(0, 4) + "A1"; + Device device2 = deviceAppService.findDeviceByCode(device_code2); + LampThreecolorDeviceDriver driver2 = (LampThreecolorDeviceDriver) device2.getDeviceDriver(); + driver2.setCar_no(""); } result.put("code", HttpStatus.HTTP_OK); result.put("message", "ok");