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

Merge branch 'master' into master_merge

Browse Source
This commit is contained in:
liuxy
2024-07-15 09:11:28 +08:00
parent e60a4a9794 46bd8c83ee
commit 4f63db49e0
36 changed files with 906 additions and 673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -209,6 +209,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
LampThreecolorDeviceDriver lampThreecolorDeviceDriver;
SiemensConveyorDeviceDriver siemensConveyorDeviceDriver;
PluggingUnpluggingMachineDeviceDriver pluggingUnpluggingMachineDeviceDriver;
SiemensWeightConveyorDeviceDriver siemensWeightConveyorDeviceDriver;
if (device.getDeviceDriver() instanceof HongXiangStationDeviceDriver) {
hongXiangStationDeviceDriver = (HongXiangStationDeviceDriver) device.getDeviceDriver();
hongXiangStationDeviceDriver.writing(code, value);
@@ -225,7 +226,10 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
pluggingUnpluggingMachineDeviceDriver = (PluggingUnpluggingMachineDeviceDriver) device.getDeviceDriver();
pluggingUnpluggingMachineDeviceDriver.writing(code, value);
}
if (device.getDeviceDriver() instanceof SiemensWeightConveyorDeviceDriver) {
siemensWeightConveyorDeviceDriver = (SiemensWeightConveyorDeviceDriver) device.getDeviceDriver();
siemensWeightConveyorDeviceDriver.writing(code, value);
}
}
response.setStatus(200);