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

fix

Browse Source
This commit is contained in:
tuqiang
2024-01-03 08:52:22 +08:00
parent 278a7bca69
commit 716e13d8c3
2 changed files with 872 additions and 889 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1742
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
View File

File diff suppressed because it is too large Load Diff

19
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
View File

@@ -13,25 +13,9 @@ import org.nl.acs.device_driver.box_manipulator.BoxManipulatorDeviceDriver;
import org.nl.acs.device_driver.conveyor.box_palletizing_manipulator.BoxPalletizingManipulatorDeviceDriver;
import org.nl.acs.device_driver.manipulator.standard_manipulator.OvenGantryManipulatorDeviceDriver;
import org.nl.acs.device_driver.manipulator.standard_manipulator.BlankManipulatorDeviceDriver;
import org.nl.acs.device.service.DeviceService;
import org.nl.acs.device_driver.FeedLmsRealFailed;
import org.nl.acs.device_driver.agv.ndcone.AgvNdcOneDeviceDriver;
import org.nl.acs.device_driver.agv.ndctwo.AgvNdcTwoDeviceDriver;
import org.nl.acs.device_driver.conveyor.hongxiang_conveyor.HongXiangStationDeviceDriver;
import org.nl.acs.device_driver.conveyor.hongxiang_device.HongXiangConveyorDeviceDriver;
import org.nl.acs.device_driver.manipulator.standard_manipulator.BoxManipulatorDeviceDriver;
import org.nl.acs.device_driver.manipulator.standard_manipulator.StandardManipulatorDeviceDriver;
import org.nl.acs.device_driver.paper_tube_device2.PaperTubeConveyor2DeviceDriver;
import org.nl.acs.device_driver.subvolume_weighing_station.SubvolumeWeighingStationDriver;
import org.nl.acs.device_driver.three_color.lamp_three_color.LampThreecolorDeviceDriver;
import org.nl.acs.device_driver.conveyor.oven_manipulator.OvenGantryManipulatorDeviceDriver;
import org.nl.acs.device_driver.conveyor.plug_pull_device_site.PlugPullDeviceSiteDeviceDriver;
import org.nl.acs.device_driver.conveyor.siemens_conveyor.SiemensConveyorDeviceDriver;
import org.nl.acs.device_driver.conveyor.siemens_conveyor_ckk.SiemensConveyorCkkDeviceDriver;
import org.nl.acs.device_driver.conveyor.siemens_conveyor_labeling.SiemensConveyorLabelingDeviceDriver;
import org.nl.acs.device_driver.conveyor.slit_two_manipulator.SlitTwoManipulatorDeviceDriver;
import org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver;
import org.nl.acs.device_driver.conveyor.standard_ordinary_site.StandardOrdinarySiteDeviceDriver;
import org.nl.acs.device_driver.waste_foil_weighing_station.WasteFoilWeighingStationDriver;
import org.nl.acs.ext.wms.data.*;
@@ -183,8 +167,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
jo.put("walk_y", boxPalletizingManipulatorDeviceDriver.getWalk_y());
jo.put("task", boxPalletizingManipulatorDeviceDriver.getTask());
jo.put("error", boxPalletizingManipulatorDeviceDriver.getError());
} else {
}else if (device.getDeviceDriver() instanceof PaperTubeConveyor2DeviceDriver) {
} else if (device.getDeviceDriver() instanceof PaperTubeConveyor2DeviceDriver) {
paperTubeConveyor2DeviceDriver = (PaperTubeConveyor2DeviceDriver) device.getDeviceDriver();
jo.put("device_code", parent_device_code);
jo.put("heartbeat",paperTubeConveyor2DeviceDriver.getHeartbeat());