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

fix: 手持机下发任务报错修改,添加下发信号日志

Browse Source
This commit is contained in:
yanps
2024-04-15 09:24:24 +08:00
parent a2563eedef
commit d342c2a9ab
13 changed files with 111 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -243,6 +243,7 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
// acsToWmsService.sendDeviceStatus(param);
sendDeviceStatus(param);
}
message = "";
logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode + "复位请求标记:" + requireSucess);
logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode);
}
@@ -358,7 +359,6 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
Instruction instruction = null;
List toInstructions;
if(mode > 0) {
message = "";
switch (mode) {
case 1:
log.debug("设备运转模式:等待工作");
@@ -1070,18 +1070,20 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
apply.put("device_code", device_code);
apply.put("type", "2");
String str = acsToWmsService.applyTaskToWms(apply);
logServer.deviceExecuteLog(this.device_code, "", "", "申请空盘入库,请求参数:" + apply);
message = "申请空盘入库任务,请求参数:" + apply;
logServer.deviceExecuteLog(this.device_code, "", "", "申请空盘入库,请求参数:" + apply + ",响应参数:" + JSON.toJSONString(str));
message = "申请空盘入库任务,请求参数:" + apply + "响应参数: "+ str;
JSONObject jo = JSON.parseObject(str);
if (ObjectUtil.isEmpty(jo)) {
message = "申请空盘入库接口不通";
logServer.deviceExecuteLog(this.device_code, "", "", "申请空盘入库接口不通");
} else {
if (jo.getInteger("status") == 200) {
message = "申请空盘入库成功";
requireEmptyInSuccess = true;
} else {
message = "申请空盘入库失败，" + jo.get("message").toString();
logServer.deviceExecuteLog(this.device_code, "", "", message);
}
}
}