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

更新

Browse Source
This commit is contained in:
gengby
2022-12-09 09:22:40 +08:00
parent ce325a6e38
commit db04170b01
1 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java
View File

@@ -16,6 +16,7 @@ import org.nl.acs.device_driver.basedriver.empty_vehicle_stacking_position.Empty
import org.nl.acs.device_driver.basedriver.hailiang_smart_plc_test.HailiangSmartplcTestDeviceDriver; import org.nl.acs.device_driver.basedriver.hailiang_smart_plc_test.HailiangSmartplcTestDeviceDriver;
import org.nl.acs.device_driver.basedriver.haokai_auto_conveyor.HaoKaiAutoConveyorDeviceDriver; import org.nl.acs.device_driver.basedriver.haokai_auto_conveyor.HaoKaiAutoConveyorDeviceDriver;
import org.nl.acs.device_driver.basedriver.paint_conveyor.PaintConveyorDeviceDriver; import org.nl.acs.device_driver.basedriver.paint_conveyor.PaintConveyorDeviceDriver;
import org.nl.acs.device_driver.basedriver.standard_storage.StandardStorageDeviceDriver;
import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.ext.wms.service.AcsToWmsService;
import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.InstructionService;
import org.nl.acs.instruction.service.dto.Instruction; import org.nl.acs.instruction.service.dto.Instruction;
@@ -211,6 +212,9 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
is_feedback = true; is_feedback = true;
} }
if (addressdevice.getDeviceDriver() instanceof StandardStorageDeviceDriver){
is_feedback = true;
}
} }
if ("PauseOnStation".equals(type)) { if ("PauseOnStation".equals(type)) {
if (addressdevice.getDeviceDriver() instanceof HailiangSmartplcTestDeviceDriver) { if (addressdevice.getDeviceDriver() instanceof HailiangSmartplcTestDeviceDriver) {
@@ -247,6 +251,9 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
paintConveyorDeviceDriver.writing(2); paintConveyorDeviceDriver.writing(2);
is_feedback = true; is_feedback = true;
} }
if (addressdevice.getDeviceDriver() instanceof StandardStorageDeviceDriver){
is_feedback = true;
}
} }
} }
@@ -315,13 +322,13 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
} }
if (addressdevice.getDeviceDriver() instanceof EmptyVehicleStackingPositionDeviceDriver) { if (addressdevice.getDeviceDriver() instanceof EmptyVehicleStackingPositionDeviceDriver) {
emptyVehicleStackingPositionDeviceDriver = (EmptyVehicleStackingPositionDeviceDriver) addressdevice.getDeviceDriver(); // emptyVehicleStackingPositionDeviceDriver = (EmptyVehicleStackingPositionDeviceDriver) addressdevice.getDeviceDriver();
int number = emptyVehicleStackingPositionDeviceDriver.getNumber(); // int number = emptyVehicleStackingPositionDeviceDriver.getNumber();
if (number >= Integer.valueOf(str)) { // if (number >= Integer.valueOf(str)) {
log.info("叠盘位：" + jobno + "第" + str + "上有货！"); // log.info("叠盘位：" + jobno + "第" + str + "上有货！");
return null; // return null;
} // }
inst.setExecute_status("3"); // inst.setExecute_status("3");
is_feedback = true; is_feedback = true;
} }
@@ -354,40 +361,47 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
is_feedback = true; is_feedback = true;
} }
if (addressdevice.getDeviceDriver() instanceof StandardStorageDeviceDriver){
is_feedback = true;
}
} }
if ("PauseOnStation".equals(type)) { if ("PauseOnStation".equals(type)) {
if (addressdevice.getDeviceDriver() instanceof HailiangSmartplcTestDeviceDriver) { if (addressdevice.getDeviceDriver() instanceof HailiangSmartplcTestDeviceDriver) {
hailiangSmartplcTestDeviceDriver = (HailiangSmartplcTestDeviceDriver) addressdevice.getDeviceDriver(); // hailiangSmartplcTestDeviceDriver = (HailiangSmartplcTestDeviceDriver) addressdevice.getDeviceDriver();
inst.setExecute_status("4"); // inst.setExecute_status("4");
hailiangSmartplcTestDeviceDriver.writing(3); // hailiangSmartplcTestDeviceDriver.writing(3);
is_feedback = true; is_feedback = true;
} }
if (addressdevice.getDeviceDriver() instanceof EmptyVehicleStackingPositionDeviceDriver) { if (addressdevice.getDeviceDriver() instanceof EmptyVehicleStackingPositionDeviceDriver) {
emptyVehicleStackingPositionDeviceDriver = (EmptyVehicleStackingPositionDeviceDriver) addressdevice.getDeviceDriver(); // emptyVehicleStackingPositionDeviceDriver = (EmptyVehicleStackingPositionDeviceDriver) addressdevice.getDeviceDriver();
inst.setExecute_status("4"); // inst.setExecute_status("4");
emptyVehicleStackingPositionDeviceDriver.writing(3); // emptyVehicleStackingPositionDeviceDriver.writing(3);
is_feedback = true; is_feedback = true;
} }
if (addressdevice.getDeviceDriver() instanceof CargoLiftConveyorDeviceDriver) { if (addressdevice.getDeviceDriver() instanceof CargoLiftConveyorDeviceDriver) {
cargoLiftConveyorDeviceDriver = (CargoLiftConveyorDeviceDriver) addressdevice.getDeviceDriver(); // cargoLiftConveyorDeviceDriver = (CargoLiftConveyorDeviceDriver) addressdevice.getDeviceDriver();
inst.setExecute_status("4"); // inst.setExecute_status("4");
cargoLiftConveyorDeviceDriver.writing(3); // cargoLiftConveyorDeviceDriver.writing(3);
is_feedback = true; is_feedback = true;
} }
if (addressdevice.getDeviceDriver() instanceof HaoKaiAutoConveyorDeviceDriver) { if (addressdevice.getDeviceDriver() instanceof HaoKaiAutoConveyorDeviceDriver) {
haoKaiAutoConveyorDeviceDriver = (HaoKaiAutoConveyorDeviceDriver) addressdevice.getDeviceDriver(); // haoKaiAutoConveyorDeviceDriver = (HaoKaiAutoConveyorDeviceDriver) addressdevice.getDeviceDriver();
inst.setExecute_status("4"); // inst.setExecute_status("4");
haoKaiAutoConveyorDeviceDriver.writing(3); // haoKaiAutoConveyorDeviceDriver.writing(3);
is_feedback = true; is_feedback = true;
} }
if (addressdevice.getDeviceDriver() instanceof PaintConveyorDeviceDriver) { if (addressdevice.getDeviceDriver() instanceof PaintConveyorDeviceDriver) {
paintConveyorDeviceDriver = (PaintConveyorDeviceDriver) addressdevice.getDeviceDriver(); // paintConveyorDeviceDriver = (PaintConveyorDeviceDriver) addressdevice.getDeviceDriver();
inst.setExecute_status("4"); // inst.setExecute_status("4");
paintConveyorDeviceDriver.writing(3); // paintConveyorDeviceDriver.writing(3);
is_feedback = true;
}
if (addressdevice.getDeviceDriver() instanceof StandardStorageDeviceDriver){
is_feedback = true; is_feedback = true;
} }
} }