Browse Source

rev:光栅清除车号

master
刘先源 2 months ago
parent
commit
fa457198d9
  1. 2
      acs2/nladmin-system/pom.xml
  2. 6
      acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java

2
acs2/nladmin-system/pom.xml

@ -423,7 +423,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>1.70</version> <!-- 更新到最新版本 -->
<version>1.68</version> <!-- 更新到最新版本 -->
</dependency>
<!-- Lucene查询解析包 -->
<dependency>

6
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");

Loading…
Cancel
Save