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

1

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2022-07-05 14:58:26 +08:00
parent eb5d4feec6
commit ec0afb5dca
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wcs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
View File

@@ -744,8 +744,13 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
JSONObject jo1 = new JSONObject();
jo1.put("device_code", instnextdevice);
String start_point_code = entity.getStart_point_code();
Device deviceByCode = deviceAppService.findDeviceByCode(start_point_code);
String start_device_code = entity.getStart_device_code();
Device deviceByCode = deviceAppService.findDeviceByCode(start_device_code);
if (deviceByCode == null) {
log.debug("地址对应设备未找到");
throw new BadRequestException("地址对应设备未找到");
}
if(deviceByCode.getDeviceDriver() instanceof HailiangEngravingMachineDeviceDriver){
jo1.put("hasGoodStatus", "2");
} else {