root/shanghaikaineng_lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev：光栅清除车号

Browse Source
This commit is contained in:
liuxy
2024-12-16 11:09:54 +08:00
parent c98d3cb07b
commit fa457198d9
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acs2/nladmin-system/pom.xml
View File

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

6
acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java
View File

@@ -199,7 +199,13 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
if (driver.getAction() == XgAgvEnum.GS_ACTION_YES.getCode()) { if (driver.getAction() == XgAgvEnum.GS_ACTION_YES.getCode()) {
// 判断是否清楚车号 // 判断是否清楚车号
if (device.getExtraValue().get("is_clean").toString().equals("1")) { if (device.getExtraValue().get("is_clean").toString().equals("1")) {
// 清除第当前设备车号（第二次）
driver.setCar_no(""); 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("code", HttpStatus.HTTP_OK);
result.put("message", "ok"); result.put("message", "ok");