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

rev 增加日志

Browse Source
This commit is contained in:
gengby
2023-04-21 10:27:34 +08:00
parent 363b0a81b4
commit 57a3f0f8db
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -179,7 +179,7 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
error = this.itemProtocol.getItem_error(); error = this.itemProtocol.getItem_error();
task = this.itemProtocol.getItem_task(); task = this.itemProtocol.getItem_task();
action = this.itemProtocol.getItem_action(); action = this.itemProtocol.getItem_action();
//container = this.barcode();
if (mode != last_mode) { if (mode != last_mode) {
this.setRequireSucess(false); this.setRequireSucess(false);
logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode); logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode);
@@ -199,6 +199,9 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
if (action != last_action) { if (action != last_action) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号action：" + last_action + "->" + action); logServer.deviceExecuteLog(this.device_code, "", "", "信号action：" + last_action + "->" + action);
} }
// if (!StrUtil.equals(container, last_container)) {
// logServer.deviceExecuteLog(this.device_code, "", "", "信号container：" + last_container + "->" + container);
// }
if (mode == 2 && move != 0 && task > 0) { if (mode == 2 && move != 0 && task > 0) {
logServer.deviceExecuteLog(this.device_code, "", "", "开始反馈任务状态.......指令号:" + task); logServer.deviceExecuteLog(this.device_code, "", "", "开始反馈任务状态.......指令号:" + task);
@@ -215,15 +218,14 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
inst.setInstruction_status("1"); inst.setInstruction_status("1");
instructionService.update(inst); instructionService.update(inst);
} }
} else { } /*else {
logServer.deviceExecuteLog(this.device_code, "", "", "开始反馈任务中状态.......根据指令号查询到指令为空,指令号:" + task); logServer.deviceExecuteLog(this.device_code, "", "", "开始反馈任务中状态.......根据指令号查询到指令为空,指令号:" + task);
} }*/
} }
} catch (Exception var17) { } catch (Exception var17) {
logServer.deviceExecuteLog(this.device_code, "", "", "读取信号出现异常:" + var17.getMessage()); logServer.deviceExecuteLog(this.device_code, "", "", "读取信号出现异常:" + var17.getMessage());
logServer.deviceExecuteLog(this.device_code, "", "", "读取信号出现异常:栈信息" + var17.getStackTrace()); logServer.deviceExecuteLog(this.device_code, "", "", "读取信号出现异常:栈信息" + var17.getStackTrace());
return;
} }
if (!this.itemProtocol.getIsonline()) { if (!this.itemProtocol.getIsonline()) {
this.setIsonline(false); this.setIsonline(false);
@@ -251,6 +253,9 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
log.debug("设备运转模式:等待工作"); log.debug("设备运转模式:等待工作");
break; break;
case 2: case 2:
if (!requireSucess){
logServer.deviceExecuteLog(this.device_code, "", "", "扫码器扫到的条码为:" + barcode());
}
//申请任务 //申请任务
if (!StrUtil.isEmpty(barcode()) && !requireSucess) { if (!StrUtil.isEmpty(barcode()) && !requireSucess) {
instruction_require(barcode()); instruction_require(barcode());
@@ -276,6 +281,7 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
last_move = move; last_move = move;
last_task = task; last_task = task;
last_action = action; last_action = action;
//last_container = container;
} }
public boolean exe_error() { public boolean exe_error() {