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-11-08 17:41:16 +08:00
parent 61573ae778
commit 414ecdaea1
2 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/AgvWaitUtil.java
View File

@@ -42,9 +42,8 @@ public class AgvWaitUtil {
log.info("仙工AGV请求取货，设备号 - {}", deviceCode); log.info("仙工AGV请求取货，设备号 - {}", deviceCode);
boolean flag = false; boolean flag = false;
JSONObject jsonDevice = WQLObject.getWQLObject("acs_storage_cell").query("storage_code = '" + deviceCode + "'").uniqueResult(0);
Device device = this.deviceAppService.findDeviceByCode(deviceCode); Device device = this.deviceAppService.findDeviceByCode(deviceCode);
if (ObjectUtil.isEmpty(device) && ObjectUtil.isEmpty(jsonDevice)) { if (ObjectUtil.isEmpty(device)) {
throw new BadRequestException("请求失败，未找到设备！"); throw new BadRequestException("请求失败，未找到设备！");
} }
@@ -85,9 +84,8 @@ public class AgvWaitUtil {
log.info("仙工AGV取货完成后请求离开，设备号 - {}", deviceCode); log.info("仙工AGV取货完成后请求离开，设备号 - {}", deviceCode);
boolean flag = false; boolean flag = false;
JSONObject jsonDevice = WQLObject.getWQLObject("acs_storage_cell").query("storage_code = '" + deviceCode + "'").uniqueResult(0);
Device device = this.deviceAppService.findDeviceByCode(deviceCode); Device device = this.deviceAppService.findDeviceByCode(deviceCode);
if (ObjectUtil.isEmpty(device) && ObjectUtil.isEmpty(jsonDevice)) { if (ObjectUtil.isEmpty(device)) {
throw new BadRequestException("请求失败，未找到设备！"); throw new BadRequestException("请求失败，未找到设备！");
} }
@@ -128,9 +126,8 @@ public class AgvWaitUtil {
log.info("仙工AGV请求放货，设备号 - {}", deviceCode); log.info("仙工AGV请求放货，设备号 - {}", deviceCode);
boolean flag = false; boolean flag = false;
JSONObject jsonDevice = WQLObject.getWQLObject("acs_storage_cell").query("storage_code = '" + deviceCode + "'").uniqueResult(0);
Device device = this.deviceAppService.findDeviceByCode(deviceCode); Device device = this.deviceAppService.findDeviceByCode(deviceCode);
if (ObjectUtil.isEmpty(device) && ObjectUtil.isEmpty(jsonDevice)) { if (ObjectUtil.isEmpty(device)) {
throw new BadRequestException("请求失败，未找到设备！"); throw new BadRequestException("请求失败，未找到设备！");
} }
@@ -177,9 +174,8 @@ public class AgvWaitUtil {
log.info("仙工AGV放货完成后请求离开，设备号 - {}", deviceCode); log.info("仙工AGV放货完成后请求离开，设备号 - {}", deviceCode);
boolean flag = false; boolean flag = false;
JSONObject jsonDevice = WQLObject.getWQLObject("acs_storage_cell").query("storage_code = '" + deviceCode + "'").uniqueResult(0);
Device device = this.deviceAppService.findDeviceByCode(deviceCode); Device device = this.deviceAppService.findDeviceByCode(deviceCode);
if (ObjectUtil.isEmpty(device) && ObjectUtil.isEmpty(jsonDevice)) { if (ObjectUtil.isEmpty(device)) {
throw new BadRequestException("请求失败，未找到设备！"); throw new BadRequestException("请求失败，未找到设备！");
} }

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

@@ -892,13 +892,10 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
if (StrUtil.isBlank(address)) { if (StrUtil.isBlank(address)) {
throw new BadRequestException("请求失败，地址为空！"); throw new BadRequestException("请求失败，地址为空！");
} }
WQLObject tab = WQLObject.getWQLObject("acs_storage_cell");
if (address.contains("IN")) { if (address.contains("IN")) {
String deviceCodeNow = address.substring(0, address.length() - 5); String deviceCodeNow = address.substring(0, address.length() - 5);
JSONObject jsonDevice = tab.query("storage_code = '" + deviceCodeNow + "'").uniqueResult(0); if (ObjectUtil.isEmpty(deviceAppService.findDeviceByCode(deviceCodeNow))) {
if (ObjectUtil.isEmpty(deviceAppService.findDeviceByCode(deviceCodeNow)) && ObjectUtil.isEmpty(jsonDevice)) {
throw new BadRequestException("设备号 " + deviceCodeNow + " 不存在！"); throw new BadRequestException("设备号 " + deviceCodeNow + " 不存在！");
} }
@@ -910,9 +907,7 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
} }
if (address.contains("OUT")) { if (address.contains("OUT")) {
String deviceCodeNow = address.substring(0, address.length() - 6); String deviceCodeNow = address.substring(0, address.length() - 6);
JSONObject jsonDevice = tab.query("storage_code = '" + deviceCodeNow + "'").uniqueResult(0); if (ObjectUtil.isEmpty(deviceAppService.findDeviceByCode(deviceCodeNow))) {
if (ObjectUtil.isEmpty(deviceAppService.findDeviceByCode(deviceCodeNow)) && ObjectUtil.isEmpty(jsonDevice)) {
throw new BadRequestException("设备号 " + deviceCodeNow + " 不存在！"); throw new BadRequestException("设备号 " + deviceCodeNow + " 不存在！");
} }