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

add：新增烘箱报警信息

Browse Source
This commit is contained in:
tuqiang
2025-11-17 09:29:39 +08:00
parent 18d757588e
commit 9a035dda0b
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/hongxiang_device/HongXiangConveyorDeviceDriver.java
View File

@@ -196,9 +196,9 @@ public class HongXiangConveyorDeviceDriver extends AbstractOpcDeviceDriver imple
}
if (mode == 0) {
this.setIsonline(false);
message = "有报警";
message = "脱机";
//无报警
} else if (error != 0 && error1 != 1) {
} else if (error != 0 || error1 != 0) {
this.setIserror(true);
message = "有报警";
//无报警
@@ -415,7 +415,13 @@ public class HongXiangConveyorDeviceDriver extends AbstractOpcDeviceDriver imple
/*map.put("action", action);
map.put("message", message);*/
/*map.put("task", this.getTask());*/
map.put("error", ErrorUtil.getDictDetail("hx_error_type", String.valueOf(this.getError())));
map.put("error", "正常");
if(this.getError() != 0){
map.put("error", "error有报警,请检查烘箱！");
}
if (this.getError1() != 0){
map.put("error", "error1有报警,请检查烘箱！");
}
map.put("temperature", temperature);
map.put("countdown_house", countdown_house);
map.put("countdown_min", countdown_min);

4
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
View File

@@ -1150,6 +1150,10 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
errorInfo.put("device_name", conveyorWithScannerWeightDeviceDriver.getDevice().getDevice_name());
errorInfo.put("error_code", conveyorWithScannerWeightDeviceDriver.getError());
errorInfo.put("error_message", ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(conveyorWithScannerWeightDeviceDriver.getError())));
if (conveyorWithScannerWeightDeviceDriver.getError() == 0 && conveyorWithScannerWeightDeviceDriver.getIserror()) {
errorInfo.put("error_code", 111);
errorInfo.put("error_message", conveyorWithScannerWeightDeviceDriver.getMessage());
}
respData.add(errorInfo);
} else if (device.getDeviceDriver() instanceof UnBoxLableConveyorDeviceDriver) {
UnBoxLableConveyorDeviceDriver unBoxLableConveyorDeviceDriver = (UnBoxLableConveyorDeviceDriver) device.getDeviceDriver();