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

update:大屏接口修改

Browse Source
This commit is contained in:
songxiaopeng
2024-04-18 09:17:36 +08:00
parent f88d6b4802
commit f794988b37
5 changed files with 114 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,6 +11,7 @@ import org.nl.acs.agv.AgvUtil;
import org.nl.acs.config.AcsConfig;
import org.nl.acs.device.service.DeviceService;
import org.nl.acs.device_driver.basedriver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver;
import org.nl.acs.device_driver.lnsh.converor_barcode.ConveyorBarcodeDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_Laminating_machine.ItemProtocol;
import org.nl.acs.device_driver.lnsh.lnsh_Laminating_machine.LnshLaminatingMachineDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_fold_disc_site.LnshFoldDiscSiteDeviceDriver;
@@ -1273,6 +1274,12 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
if (ObjectUtil.isEmpty(device)) {
continue;
}
if (device.getDeviceDriver() instanceof ConveyorBarcodeDeviceDriver) {
ConveyorBarcodeDeviceDriver driver = (ConveyorBarcodeDeviceDriver) device.getDeviceDriver();
status.put("mode", driver.getMode());
status.put("error", driver.getError());
status.put("move", driver.getMove());
}
if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) {
LnshPalletizingManipulatorSiteDeviceDriver driver = (LnshPalletizingManipulatorSiteDeviceDriver) device.getDeviceDriver();
status.put("mode", driver.getMode());