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

更新

Browse Source
This commit is contained in:
gengby
2023-01-04 13:55:21 +08:00
parent 363d6b7f0d
commit 3d1b61cb6c
1 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
View File

@@ -20,6 +20,7 @@ import org.nl.acs.device_driver.lamp_three_color.LampThreecolorDeviceDriver;
import org.nl.acs.device_driver.standard_conveyor_control.StandardCoveyorControlDeviceDriver; import org.nl.acs.device_driver.standard_conveyor_control.StandardCoveyorControlDeviceDriver;
import org.nl.acs.device_driver.standard_conveyor_control_with_plcscanner.StandardCoveyorControlWithPlcScannerDeviceDriver; import org.nl.acs.device_driver.standard_conveyor_control_with_plcscanner.StandardCoveyorControlWithPlcScannerDeviceDriver;
import org.nl.acs.device_driver.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver; import org.nl.acs.device_driver.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver;
import org.nl.acs.device_driver.standard_conveyor_line.StandardConveyorLineDeviceDriver;
import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver; import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver;
import org.nl.acs.device_driver.standard_storage.StandardStorageDeviceDriver; import org.nl.acs.device_driver.standard_storage.StandardStorageDeviceDriver;
import org.nl.acs.device_driver.traffic_light.TrafficLightDeviceDriver; import org.nl.acs.device_driver.traffic_light.TrafficLightDeviceDriver;
@@ -298,7 +299,24 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
Device startdevice = appService.findDeviceByCode(dto.getStart_device_code()); Device startdevice = appService.findDeviceByCode(dto.getStart_device_code());
Device nextdevice = appService.findDeviceByCode(dto.getNext_device_code()); Device nextdevice = appService.findDeviceByCode(dto.getNext_device_code());
dto.setRemark(startdevice.getBatch()); dto.setRemark(startdevice.getBatch());
StandardConveyorLineDeviceDriver standardConveyorLineDeviceDriver;
StandardCoveyorControlDeviceDriver standardCoveyorControlDeviceDriver;
if (startdevice.getDeviceDriver() instanceof StandardConveyorLineDeviceDriver) {
standardConveyorLineDeviceDriver = (StandardConveyorLineDeviceDriver) startdevice.getDeviceDriver();
standardConveyorLineDeviceDriver.writing(1, 1);
standardConveyorLineDeviceDriver.writing(3, Integer.parseInt(dto.getInstruction_code()));
}
if (nextdevice.getDeviceDriver() instanceof StandardConveyorLineDeviceDriver) {
standardConveyorLineDeviceDriver = (StandardConveyorLineDeviceDriver) nextdevice.getDeviceDriver();
standardConveyorLineDeviceDriver.writing(1, 1);
standardConveyorLineDeviceDriver.writing(3, Integer.parseInt(dto.getInstruction_code()));
}
// if (startdevice.getDeviceDriver() instanceof StandardCoveyorControlDeviceDriver) {
// standardCoveyorControlDeviceDriver = (StandardCoveyorControlDeviceDriver) startdevice.getDeviceDriver();
// //standardCoveyorControlDeviceDriver.writing();
// }
try { try {
// != 0 为agv任务 // != 0 为agv任务
@@ -913,7 +931,6 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
} }
@Override @Override
public Instruction findByInstCodeFromCache(String inst_code) { public Instruction findByInstCodeFromCache(String inst_code) {
for (int i = 0; i < this.instructions.size(); i++) { for (int i = 0; i < this.instructions.size(); i++) {
@@ -933,7 +950,8 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
return inst; return inst;
} }
} }
return null; } return null;
}
@Override @Override
public Instruction findByIdFromCache(String id) { public Instruction findByIdFromCache(String id) {