root/lanzhouhailiang_one
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-21 14:53:55 +08:00
parent 8f5511c2d6
commit ff00076083
6 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
View File

@@ -103,7 +103,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
agvaddr = arr[18] * 256 + arr[19];
//车号
int carno = arr[20];
logServer.deviceExecuteLog(this.device_code, "", "", "接收agv上报信息：" + "phase--" + phase + " index--" + index + " 指令号--" + ikey + " 站点号--" + agvaddr + " 车号--" + carno);
log.info(this.device_code, "", "", "接收agv上报信息：" + "phase--" + phase + " index--" + index + " 指令号--" + ikey + " 站点号--" + agvaddr + " 车号--" + carno);
Instruction link_inst = null;
List<Instruction> insts = null;
Instruction inst = null;

4
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/device_status/DeviceStatusDeviceDriver.java
View File

@@ -94,7 +94,7 @@ public class DeviceStatusDeviceDriver extends AbstractOpcDeviceDriver implements
DeviceErrorLogDto dto = new DeviceErrorLogDto();
dto.setDevice_code(device_id);
dto.setError_code(String.valueOf(error));
dto.setError_info(ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(error)));
dto.setError_info(ErrorUtil.getDictDetail("lk_error_type", String.valueOf(error)));
deviceErrorLogService.create(dto);
}
}
@@ -123,7 +123,7 @@ public class DeviceStatusDeviceDriver extends AbstractOpcDeviceDriver implements
JSONObject param = new JSONObject();
param.put("device_code", this.device_id);
param.put("error", alarm);
param.put("error_msg", iserror ? ErrorUtil.getDictDetail("ssx_error_type", alarm) : "");
param.put("error_msg", iserror ? ErrorUtil.getDictDetail("lk_error_type", alarm) : "");
param.put("device_name", this.getDevice().getDevice_name());
param.put("device_type", "3");
param.put("product_area", paramService.findByCode("productArea").getValue());

14
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java
View File

@@ -220,10 +220,11 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
requireEmptyInSuccess = false;
}
} else if (StrUtil.equals(this.device_code, "1016")) {
if (mode == 8 && last_mode == 2) {
if (mode == 8 && (last_mode == 2 || last_mode == 3)) {
requireSucess = false;
requireEmptyInSuccess = false;
}
} else {
requireSucess = false;
requireEmptyInSuccess = false;
@@ -275,7 +276,16 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
}
if ("true".equals(this.device.getExtraValue().get("sendDeviceStatus"))) {
if(error != 0 && error != 110 && error != 70 ){
if (error != 0) {
DeviceErrorLogDto dto = new DeviceErrorLogDto();
dto.setDevice_code(device_code);
dto.setError_code(String.valueOf(error));
String errorInfo = ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(error));
dto.setError_info(errorInfo);
deviceErrorLogService.create(dto);
}
if(error != 110 && error != 70 ){
JSONObject param = new JSONObject();
param.put("device_code", this.device_code);
param.put("error", error);

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

@@ -208,7 +208,7 @@ public class SiemensConveyorLabelingDeviceDriver extends AbstractOpcDeviceDriver
deviceErrorLogService.create(dto);
}
if(error != 0 && error != 110 && error != 70 ) {
if(error != 110 && error != 70 ) {
JSONObject param = new JSONObject();
param.put("device_code", this.device_code);
param.put("error", error);

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

@@ -860,10 +860,10 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
apply.put("vehicle_code", container_code);
apply.put("device_code", device_code);
apply.put("type", "1");
logServer.deviceExecuteLog(this.device_code, "", "", "申请入库,请求参数:" + apply.toString());
logServer.deviceExecuteLog(this.device_code, "", "", "申请入库,木箱号:"+ container_code + ",请求参数:" + apply.toString());
String str = acsToWmsService.applyTaskToWms(apply);
JSONObject jo = JSON.parseObject(str);
logServer.deviceExecuteLog(this.device_code, "", "", "申请入库,返回参数:" + jo.toString());
logServer.deviceExecuteLog(this.device_code, "", "", "申请入库,木箱号:"+ container_code + ",返回参数:" + jo.toString());
if (ObjectUtil.isEmpty(jo)) {
message = "接口不通";
List list = new ArrayList();

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

@@ -835,7 +835,9 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
JSONObject json = new JSONObject();
json.put("task_code", task_code);
json.put("ext_task_id", ext_task_id);
json.put("message", e.getMessage());
json.put("message", "起始点:"+ task_dto.getStart_point_code() + ",终点:"+
task_dto.getNext_point_code()+",条码:" + task_dto.getVehicle_code() +
"," + e.getMessage());
errArr.add(json);
continue;
}