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

rev 反馈报警

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2023-09-06 22:05:00 +08:00
parent 8231d6d622
commit bced0538ac
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
View File

@@ -410,6 +410,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
boolean isCloseDoor = this.judgeCloseDoor(start_device_code, next_device_code); boolean isCloseDoor = this.judgeCloseDoor(start_device_code, next_device_code);
//未关门结束 //未关门结束
if (isCloseDoor) { if (isCloseDoor) {
notCreateInstMessage = "手动创建指令未下发电气信号原因->取货位:" + start_device_code + ",放货位:" + next_device_code +",存在关联的同一列烘箱设备未关门!指令号:" + instruction.getInstruction_code();
return false; return false;
} }
instruction.setInstruction_status("1"); instruction.setInstruction_status("1");

2
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java
View File

@@ -254,7 +254,7 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
logServer.deviceExecuteLog(this.device_code, "", "", "信号move：" + last_move + "->" + move); logServer.deviceExecuteLog(this.device_code, "", "", "信号move：" + last_move + "->" + move);
} }
if (error != last_error) { if (error != last_error) {
if (error != 0) { if(error != 0 && error != 110 && error != 70 ){
DeviceErrorLogDto dto = new DeviceErrorLogDto(); DeviceErrorLogDto dto = new DeviceErrorLogDto();
dto.setDevice_code(device_code); dto.setDevice_code(device_code);
dto.setError_code(String.valueOf(error)); dto.setError_code(String.valueOf(error));

2
acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
View File

@@ -386,7 +386,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
// list.add(task); // list.add(task);
// } // }
// } // }
Instruction instruction = instructionService.findByDeviceCodeFromCache(device_code); Instruction instruction = instructionService.findByDeviceCodeFromCache(task.getNext_device_code());
if (ObjectUtil.isNotEmpty(instruction)) { if (ObjectUtil.isNotEmpty(instruction)) {
if (StrUtil.equals(instruction.getStart_device_code(), device_code)) { if (StrUtil.equals(instruction.getStart_device_code(), device_code)) {
list.add(task); list.add(task);