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

更新

Browse Source
This commit is contained in:
loujf
2022-07-19 19:43:58 +08:00
parent e1178d6b9c
commit f63b484aa0
1 changed files with 90 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_conveyor_control/StandardCoveyorControlDeviceDriver.java
View File

@@ -631,6 +631,21 @@ public synchronized boolean instruction_apply(String container_code) throws Exce
if (byNextDeviceCode.size() >= list.size()) { if (byNextDeviceCode.size() >= list.size()) {
return true; return true;
} }
int count = 0;
for (int i = 0; i < list.size(); i++) {
String code = list.get(i);
Device device = deviceAppservice.findDeviceByCode(code);
StandardCoveyorControlDeviceDriver standardCoveyorControlDeviceDriver;
if (device.getDeviceDriver() instanceof StandardCoveyorControlDeviceDriver) {
standardCoveyorControlDeviceDriver = (StandardCoveyorControlDeviceDriver) device.getDeviceDriver();
if (standardCoveyorControlDeviceDriver.getMove() != 0) count += 1;
}
}
//如果当前关联的设备中都有货的话，就返回
if (count != 0 && count >= list.size()) {
return true;
}
instructionService.create(instdto); instructionService.create(instdto);
Instruction instdto2 = new Instruction(); Instruction instdto2 = new Instruction();
@@ -680,6 +695,21 @@ public synchronized boolean instruction_apply(String container_code) throws Exce
if (byNextDeviceCode.size() >= list.size()) { if (byNextDeviceCode.size() >= list.size()) {
return true; return true;
} }
int count = 0;
for (int i = 0; i < list.size(); i++) {
String code = list.get(i);
Device device = deviceAppservice.findDeviceByCode(code);
StandardCoveyorControlDeviceDriver standardCoveyorControlDeviceDriver;
if (device.getDeviceDriver() instanceof StandardCoveyorControlDeviceDriver) {
standardCoveyorControlDeviceDriver = (StandardCoveyorControlDeviceDriver) device.getDeviceDriver();
if (standardCoveyorControlDeviceDriver.getMove() != 0) count += 1;
}
}
//如果当前关联的设备中都有货的话，就返回
if (count != 0 && count >= list.size()) {
return true;
}
instructionService.create(instdto); instructionService.create(instdto);
//创建指令后修改任务状态 //创建指令后修改任务状态
@@ -719,6 +749,21 @@ public synchronized boolean instruction_apply(String container_code) throws Exce
if (byNextDeviceCode.size() >= list.size()) { if (byNextDeviceCode.size() >= list.size()) {
return true; return true;
} }
int count = 0;
for (int i = 0; i < list.size(); i++) {
String code = list.get(i);
Device device = deviceAppservice.findDeviceByCode(code);
StandardCoveyorControlDeviceDriver standardCoveyorControlDeviceDriver;
if (device.getDeviceDriver() instanceof StandardCoveyorControlDeviceDriver) {
standardCoveyorControlDeviceDriver = (StandardCoveyorControlDeviceDriver) device.getDeviceDriver();
if (standardCoveyorControlDeviceDriver.getMove() != 0) count += 1;
}
}
//如果当前关联的设备中都有货的话，就返回
if (count != 0 && count >= list.size()) {
return true;
}
instructionService.create(instdto); instructionService.create(instdto);
//创建指令后修改任务状态 //创建指令后修改任务状态
@@ -957,6 +1002,21 @@ public synchronized boolean instruction_apply(String container_code) throws Exce
return true; return true;
} }
int count = 0;
for (int i = 0; i < list.size(); i++) {
String code = list.get(i);
Device device = deviceAppservice.findDeviceByCode(code);
StandardCoveyorControlDeviceDriver standardCoveyorControlDeviceDriver;
if (device.getDeviceDriver() instanceof StandardCoveyorControlDeviceDriver) {
standardCoveyorControlDeviceDriver = (StandardCoveyorControlDeviceDriver) device.getDeviceDriver();
if (standardCoveyorControlDeviceDriver.getMove() != 0) count += 1;
}
}
//如果当前关联的设备中都有货的话，就返回
if (count != 0 && count >= list.size()) {
return true;
}
instructionService.create(instdto); instructionService.create(instdto);
Instruction instdto2 = new Instruction(); Instruction instdto2 = new Instruction();
@@ -1006,6 +1066,21 @@ public synchronized boolean instruction_apply(String container_code) throws Exce
if (byNextDeviceCode.size() >= list.size()) { if (byNextDeviceCode.size() >= list.size()) {
return true; return true;
} }
int count = 0;
for (int i = 0; i < list.size(); i++) {
String code = list.get(i);
Device device = deviceAppservice.findDeviceByCode(code);
StandardCoveyorControlDeviceDriver standardCoveyorControlDeviceDriver;
if (device.getDeviceDriver() instanceof StandardCoveyorControlDeviceDriver) {
standardCoveyorControlDeviceDriver = (StandardCoveyorControlDeviceDriver) device.getDeviceDriver();
if (standardCoveyorControlDeviceDriver.getMove() != 0) count += 1;
}
}
//如果当前关联的设备中都有货的话，就返回
if (count != 0 && count >= list.size()) {
return true;
}
instructionService.create(instdto); instructionService.create(instdto);
//创建指令后修改任务状态 //创建指令后修改任务状态
@@ -1046,6 +1121,21 @@ public synchronized boolean instruction_apply(String container_code) throws Exce
if (byNextDeviceCode.size() >= list.size()) { if (byNextDeviceCode.size() >= list.size()) {
return true; return true;
} }
int count = 0;
for (int i = 0; i < list.size(); i++) {
String code = list.get(i);
Device device = deviceAppservice.findDeviceByCode(code);
StandardCoveyorControlDeviceDriver standardCoveyorControlDeviceDriver;
if (device.getDeviceDriver() instanceof StandardCoveyorControlDeviceDriver) {
standardCoveyorControlDeviceDriver = (StandardCoveyorControlDeviceDriver) device.getDeviceDriver();
if (standardCoveyorControlDeviceDriver.getMove() != 0) count += 1;
}
}
//如果当前关联的设备中都有货的话，就返回
if (count != 0 && count >= list.size()) {
return true;
}
instructionService.create(instdto); instructionService.create(instdto);
//创建指令后修改任务状态 //创建指令后修改任务状态