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-19 10:53:52 +08:00
parent bab0bb2520
commit 363b0a81b4
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -136,6 +136,7 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
ScannerDeviceDriver scanner = this.getScanner(); ScannerDeviceDriver scanner = this.getScanner();
scanner.cleanBarcode(); scanner.cleanBarcode();
} }
public synchronized boolean finish_instruction() throws Exception { public synchronized boolean finish_instruction() throws Exception {
instructionService.finish(inst); instructionService.finish(inst);
return true; return true;
@@ -361,10 +362,10 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
} else if (type == 3) { } else if (type == 3) {
itemMap.put(to_task, command); itemMap.put(to_task, command);
log.info("设备:" + device_code + ",下发PLC信号" + to_task + ",value:" + command); log.info("设备:" + device_code + ",下发PLC信号" + to_task + ",value:" + command);
} else if (type == 4) { } else if (type == 4) {
itemMap.put(to_door, command); itemMap.put(to_door, command);
log.info("设备:" + device_code + ",下发PLC信号" + to_task + ",value:" + command); log.info("设备:" + device_code + ",下发PLC信号" + to_task + ",value:" + command);
} else if (type == 5) { } else if (type == 5) {
itemMap.put(to_floor, command); itemMap.put(to_floor, command);
log.info("设备:" + device_code + ",下发PLC信号" + to_task + ",value:" + command); log.info("设备:" + device_code + ",下发PLC信号" + to_task + ",value:" + command);
} }
@@ -566,6 +567,7 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
} else { } else {
if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "1")) { if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "1")) {
message = "申请任务中..."; message = "申请任务中...";
logServer.deviceExecuteLog(device_code, "", "", "开始申请任务...条码信息:" + container_code);
JSONObject apply = new JSONObject(); JSONObject apply = new JSONObject();
apply.put("type", "6"); apply.put("type", "6");
apply.put("vehicle_code", container_code); apply.put("vehicle_code", container_code);