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

更新：开启缓存货位光电

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2023-02-22 10:57:07 +08:00
parent f5bdddaf82
commit d3662bb58b
1 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java
View File

@@ -219,17 +219,17 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
//嘉耐缓存货架
if (device.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) {
lnshLaminatingMachineDeviceDriver = (LnshLaminatingMachineDeviceDriver) device.getDeviceDriver();
// if (lnshLaminatingMachineDeviceDriver.getMove() != 0) {
// inst.setExecute_status("1");
// instructionService.update(inst);
// data = AgvService.sendAgvOneModeInst(phase, index, 0);
// flag = true;
// } else {
// logServer.deviceExecuteLog("ndc","","", "AGV请求取货设备{}无货,无法反馈");
// }
if (lnshLaminatingMachineDeviceDriver.getMove() != 0) {
inst.setExecute_status("1");
instructionService.update(inst);
data = AgvService.sendAgvOneModeInst(phase, index, 0);
flag = true;
} else {
logServer.deviceExecuteLog("ndc","","", "AGV请求取货设备{}无货,无法反馈");
}
inst.setExecute_status("1");
instructionService.update(inst);
data = AgvService.sendAgvOneModeInst(phase, index, 0);
// data = AgvService.sendAgvOneModeInst(phase, index, 0);
flag = true;
}
//嘉耐工位模板
@@ -318,17 +318,17 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
//嘉耐缓存货架
if (device.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) {
lnshLaminatingMachineDeviceDriver = (LnshLaminatingMachineDeviceDriver) device.getDeviceDriver();
// if (lnshLaminatingMachineDeviceDriver.getMove() == 0) {
// inst.setExecute_status("5");
// instructionService.update(inst);
// data = AgvService.sendAgvOneModeInst(phase, index, 0);
// flag = true;
// } else {
// logServer.deviceExecuteLog("ndc","","","AGV取货完成请求离开设备{}有货,无法反馈");
// }
if (lnshLaminatingMachineDeviceDriver.getMove() == 0) {
inst.setExecute_status("5");
instructionService.update(inst);
data = AgvService.sendAgvOneModeInst(phase, index, 0);
flag = true;
} else {
logServer.deviceExecuteLog("ndc","","","AGV取货完成请求离开设备{}有货,无法反馈");
}
inst.setExecute_status("5");
instructionService.update(inst);
data = AgvService.sendAgvOneModeInst(phase, index, 0);
// data = AgvService.sendAgvOneModeInst(phase, index, 0);
flag = true;
}
//嘉耐工位模板
@@ -440,17 +440,17 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
//嘉耐缓存货架
if (device.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) {
lnshLaminatingMachineDeviceDriver = (LnshLaminatingMachineDeviceDriver) device.getDeviceDriver();
// if (lnshLaminatingMachineDeviceDriver.getMove() == 0) {
// inst.setExecute_status("3");
// instructionService.update(inst);
// data = AgvService.sendAgvOneModeInst(phase, index, 0);
// flag = true;
// } else {
// logServer.deviceExecuteLog("ndc","","","AGV请求放货设备{}有货,无法反馈");
// }
inst.setExecute_status("3");
if (lnshLaminatingMachineDeviceDriver.getMove() == 0) {
inst.setExecute_status("3");
instructionService.update(inst);
data = AgvService.sendAgvOneModeInst(phase, index, 0);
flag = true;
} else {
logServer.deviceExecuteLog("ndc","","","AGV请求放货设备{}有货,无法反馈");
}
inst.setExecute_status("7");
instructionService.update(inst);
data = AgvService.sendAgvOneModeInst(phase, index, 0);
// data = AgvService.sendAgvOneModeInst(phase, index, 0);
flag = true;
}
//嘉耐工位模板
@@ -521,17 +521,17 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
//嘉耐缓存货架
if (device.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) {
lnshLaminatingMachineDeviceDriver = (LnshLaminatingMachineDeviceDriver) device.getDeviceDriver();
// if (lnshLaminatingMachineDeviceDriver.getMove() != 0) {
// inst.setExecute_status("6");
// instructionService.update(inst);
// data = AgvService.sendAgvOneModeInst(phase, index, 0);
// flag = true;
// } else {
// logServer.deviceExecuteLog("ndc","","","AGV放货完成请求离开设备{}无货,无法反馈");
// }
if (lnshLaminatingMachineDeviceDriver.getMove() != 0) {
inst.setExecute_status("6");
instructionService.update(inst);
data = AgvService.sendAgvOneModeInst(phase, index, 0);
flag = true;
} else {
logServer.deviceExecuteLog("ndc","","","AGV放货完成请求离开设备{}无货,无法反馈");
}
inst.setExecute_status("6");
instructionService.update(inst);
data = AgvService.sendAgvOneModeInst(phase, index, 0);
// data = AgvService.sendAgvOneModeInst(phase, index, 0);
flag = true;
}
//嘉耐工位模板