嘉耐更新

This commit is contained in:
loujf
2022-08-16 09:43:43 +08:00
parent cb2d3d5d09
commit 3725446988
15 changed files with 10 additions and 4598 deletions

View File

@@ -14,7 +14,6 @@ import org.nl.acs.config.AcsConfig;
import org.nl.acs.config.server.AcsConfigService;
import org.nl.acs.device.service.DeviceService;
import org.nl.acs.device.service.impl.DeviceServiceImpl;
import org.nl.acs.device_driver.lnsh.lnsh_package_site.LnshPackageSiteDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_station.LnshStationDeviceDriver;
import org.nl.acs.device_driver.machines_site.MachinesSiteDeviceDriver;
import org.nl.acs.device_driver.special_ordinary_site.SpecialOrdinarySiteDeviceDriver;
@@ -719,7 +718,6 @@ public class AgvServiceImpl implements AgvService {
StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver;
SpecialOrdinarySiteDeviceDriver specialOrdinarySiteDeviceDriver;
LnshStationDeviceDriver lnshStationDeviceDriver;
LnshPackageSiteDeviceDriver lnshPackageSiteDeviceDriver;
//请求进入
if ("onEntry".equals(type)) {
@@ -759,23 +757,6 @@ public class AgvServiceImpl implements AgvService {
}
}
}
//晟华包装线工位
if (addressdevice.getDeviceDriver() instanceof LnshPackageSiteDeviceDriver) {
lnshPackageSiteDeviceDriver = (LnshPackageSiteDeviceDriver) addressdevice.getDeviceDriver();
//请求取货
if ("Load".equals(action)) {
if (lnshPackageSiteDeviceDriver.getMode() == 2 && lnshPackageSiteDeviceDriver.getMove() > 0) {
inst.setExecute_status("1");
is_feedback = true;
}
//请求放货
} else if ("Unload".equals(action)) {
if (lnshPackageSiteDeviceDriver.getMode() == 2 && lnshPackageSiteDeviceDriver.getMove() == 0) {
inst.setExecute_status("3");
is_feedback = true;
}
}
}
if (addressdevice.getDeviceDriver() instanceof SpecialOrdinarySiteDeviceDriver) {
specialOrdinarySiteDeviceDriver = (SpecialOrdinarySiteDeviceDriver) addressdevice.getDeviceDriver();
//请求取货
@@ -865,25 +846,6 @@ public class AgvServiceImpl implements AgvService {
}
}
}
//晟华包装线工位
if (addressdevice.getDeviceDriver() instanceof LnshPackageSiteDeviceDriver) {
lnshPackageSiteDeviceDriver = (LnshPackageSiteDeviceDriver) addressdevice.getDeviceDriver();
//取货完成
if ("Load".equals(action)) {
if (lnshPackageSiteDeviceDriver.getMode() == 2 && lnshPackageSiteDeviceDriver.getMove() == 0) {
inst.setExecute_device_code(processingVehicle);
inst.setExecute_status("2");
is_feedback = true;
}
//放货完成
} else if ("Unload".equals(action)) {
if (lnshPackageSiteDeviceDriver.getMode() == 2 && lnshPackageSiteDeviceDriver.getMove() > 0) {
inst.setExecute_device_code(address);
inst.setExecute_status("4");
is_feedback = true;
}
}
}
if (addressdevice.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) addressdevice.getDeviceDriver();
//取货完成
@@ -1170,7 +1132,6 @@ public class AgvServiceImpl implements AgvService {
StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver;
StandardStorageDeviceDriver standardStorageDeviceDriver;
LnshStationDeviceDriver lnshStationDeviceDriver;
LnshPackageSiteDeviceDriver lnshPackageSiteDeviceDriver;
//mes = AgvClientXZ.mes(zlbh, device, type);
//暂定 0就绪 1请求取货 2取货完成 3请求放货 4放货完成 5取货完成离开 6放货完成离开 7请求进入区域 8请求离开区域
@@ -1218,26 +1179,6 @@ public class AgvServiceImpl implements AgvService {
}
}
if (addressdevice.getDeviceDriver() instanceof LnshPackageSiteDeviceDriver) {
lnshPackageSiteDeviceDriver = (LnshPackageSiteDeviceDriver) addressdevice.getDeviceDriver();
flag = true;
log.info("agvstatus:" + lnshPackageSiteDeviceDriver.getFlag() + "");
//取货完成离开
if (lnshPackageSiteDeviceDriver.getFlag() == 2) {
if (lnshPackageSiteDeviceDriver.getMove() == 0) {
flag = true;
lnshPackageSiteDeviceDriver.setFlag(5);
}
}
//放货完成离开
if (lnshPackageSiteDeviceDriver.getFlag() == 4) {
if (lnshPackageSiteDeviceDriver.getMove() == 1) {
flag = true;
lnshPackageSiteDeviceDriver.setFlag(6);
}
}
}
if (addressdevice.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) addressdevice.getDeviceDriver();
flag = true;

View File

@@ -59,10 +59,8 @@ public enum DriverTypeEnum {
LNSH_KILN_LANE(42, "lnsh_kiln_lane", "嘉耐-窑车道", "station"),
LNSH_PACKAGE_PALLET_MANIPULATOR(45, "lnsh_package_pallet_manipulator", "嘉耐-包装码垛机械手", "station"),
LNSH_SPLIT_MANIPULATOR(47, "lnsh_split_manipulator", "嘉耐-拆垛机械手", "station"),
LNSH_RGV(48, "lnsh_rgv", "嘉耐双工位RGV", "rgv"),

View File

@@ -1219,7 +1219,7 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD
public void writing(int command) {
String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+ "." + org.nl.acs.device_driver.lnsh.lnsh_fold_disc_site.ItemProtocol.item_to_command;
+ "." + ItemProtocol.item_to_feedback;
String opcservcerid = this.getDevice().getOpc_server_id();
Server server = ReadUtil.getServer(opcservcerid);

View File

@@ -1234,7 +1234,7 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe
public void writing(int command) {
String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+ "." + org.nl.acs.device_driver.lnsh.lnsh_fold_disc_site.ItemProtocol.item_to_command;
+ "." + ItemProtocol.item_to_feedback;
String opcservcerid = this.getDevice().getOpc_server_id();
Server server = ReadUtil.getServer(opcservcerid);

View File

@@ -11,40 +11,22 @@ import org.nl.acs.config.server.AcsConfigService;
import org.nl.acs.device.service.DeviceService;
import org.nl.acs.device_driver.electric_fence.ElectricFenceDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_Laminating_machine.LnshLaminatingMachineDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_fold_disc_site.LnshFoldDiscSiteDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_kiln_lane.LnshKilnLaneDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_kiln_truss.LnshKilnTrussDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_labeling_machine.LnshLabelingMachineDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_mixing_mill.LnshMixingMillDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_out_kiln_truss.LnshOutKilnTrussDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_package_line.LnshPackageLineDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_package_pallet_manipulator.LnshPackagePalletManipulatorDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_package_site.LnshPackageSiteDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_pallet_storage.LnshPalletStorageDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_palletizing_manipulator.LnshPalletizingManipulatorDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_palletizing_manipulator_site.LnshPalletizingManipulatorSiteDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_press.LnshPressDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_rgv.LnshRGVDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_split_manipulator.LnshSplitManipulatorDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_station.LnshStationDeviceDriver;
import org.nl.acs.device_driver.lnsh.rljn_package_palletSplit_manipulator.RljnPackagePalletSplitManipulatorDeviceDriver;
import org.nl.acs.device_driver.machines_site.MachinesSiteDeviceDriver;
import org.nl.acs.device_driver.non_line_inspect_site.NonLineInspectSiteDeviceDriver;
import org.nl.acs.device_driver.non_line_manipulator_inspect_site.NonLineManipulatorInspectSiteDeviceDriver;
import org.nl.acs.device_driver.special_ordinary_site.SpecialOrdinarySiteDeviceDriver;
import org.nl.acs.device_driver.standard_autodoor.StandardAutodoorDeviceDriver;
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_scanner.StandardCoveyorControlWithScannerDeviceDriver;
import org.nl.acs.device_driver.standard_conveyor_monitor.StandardCoveyorMonitorDeviceDriver;
import org.nl.acs.device_driver.standard_emptypallet_site.StandardEmptyPalletSiteDeviceDriver;
import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver;
import org.nl.acs.device_driver.standard_manipulator_inspect_site.StandardManipulatorInspectSiteDeviceDriver;
import org.nl.acs.device_driver.standard_manipulator_stacking_site.StandardManipulatorStackingSiteDeviceDriver;
import org.nl.acs.device_driver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver;
import org.nl.acs.device_driver.standard_photoelectric_inspect_site.StandardPhotoelectricInspectSiteDeviceDriver;
import org.nl.acs.device_driver.standard_scanner.StandardScannerDeviceDriver;
import org.nl.acs.device_driver.weighing_site.WeighingSiteDeviceDriver;
import org.nl.acs.ext.wms.service.WmsToAcsService;
import org.nl.acs.instruction.service.InstructionService;
import org.nl.acs.instruction.service.dto.Instruction;
@@ -293,36 +275,8 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
throw new Exception("未找到对应设备:" + device_code);
}
LnshMixingMillDeviceDriver lnshMixingMillDeviceDriver;
LnshPressDeviceDriver lnshPressDeviceDriver;
LnshPackagePalletManipulatorDeviceDriver lnshPackagePalletManipulatorDeviceDriver;
LnshPalletizingManipulatorDeviceDriver lnshPalletizingManipulatorDeviceDriver;
if (device.getDeviceDriver() instanceof LnshMixingMillDeviceDriver) {
lnshMixingMillDeviceDriver = (LnshMixingMillDeviceDriver) device.getDeviceDriver();
if (StrUtil.isEmpty(qty)) {
throw new WDKException("重量不能为空");
}
if (StrUtil.isEmpty(material_code)) {
throw new WDKException("物料编号不能为空!");
}
lnshMixingMillDeviceDriver.writing("to_order_No", producetask_code);
lnshMixingMillDeviceDriver.writing("to_weight", qty);
lnshMixingMillDeviceDriver.writing("to_material_code", material_code);
is_flag = true;
}
if (device.getDeviceDriver() instanceof LnshPressDeviceDriver) {
lnshPressDeviceDriver = (LnshPressDeviceDriver) device.getDeviceDriver();
if (StrUtil.isEmpty(qty)) {
throw new WDKException("数量不能为空");
}
if (StrUtil.isEmpty(material_code)) {
throw new WDKException("物料编号不能为空!");
}
lnshPressDeviceDriver.writing("to_order_No", producetask_code);
lnshPressDeviceDriver.writing("to_qty", qty);
lnshPressDeviceDriver.writing("to_material_code", material_code);
is_flag = true;
}
if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorDeviceDriver) {
lnshPalletizingManipulatorDeviceDriver = (LnshPalletizingManipulatorDeviceDriver) device.getDeviceDriver();
if (StrUtil.isEmpty(qty)) {
@@ -482,22 +436,10 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
StandardManipulatorStackingSiteDeviceDriver standardManipulatorStackingSiteDeviceDriver;
//光电检测站点(优先入库)
StandardPhotoelectricInspectSiteDeviceDriver standardPhotoelectricInspectSiteDeviceDriver;
//晟华-混碾机
LnshMixingMillDeviceDriver lnshMixingMillDeviceDriver;
//晟华-压力机
LnshPressDeviceDriver lnshPressDeviceDriver;
//嘉耐-码垛机械手
LnshPalletizingManipulatorDeviceDriver lnshPalletizingManipulatorDeviceDriver;
//嘉耐-窑车道
LnshKilnLaneDeviceDriver lnshKilnLaneDeviceDriver;
//晟华-入出窑桁架
LnshKilnTrussDeviceDriver lnshKilnTrussDeviceDriver;
//晟华-出窑桁架
LnshOutKilnTrussDeviceDriver lnshOutKilnTrussDeviceDriver;
//晟华-叠盘工位
LnshFoldDiscSiteDeviceDriver lnshFoldDiscSiteDeviceDriver;
//晟华-托盘存储线
LnshPalletStorageDeviceDriver lnshPalletStorageDeviceDriver;
//嘉耐-包装码垛机械手
LnshPackagePalletManipulatorDeviceDriver lnshPackagePalletManipulatorDeviceDriver;
//晟华-贴标机
@@ -506,14 +448,10 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
LnshSplitManipulatorDeviceDriver lnshSplitManipulatorDeviceDriver;
//嘉耐-RGV
LnshRGVDeviceDriver lnshRGVDeviceDriver;
//晟华-包装线
LnshPackageLineDeviceDriver lnshPackageLineDeviceDriver;
//嘉耐-工位(交互模板)
LnshStationDeviceDriver lnshStationDeviceDriver;
//嘉耐-缓存货架
LnshLaminatingMachineDeviceDriver lnshLaminatingMachineDeviceDriver;
//嘉耐-包装线工位
LnshPackageSiteDeviceDriver lnshPackageSiteDeviceDriver;
//嘉耐-包装码拆垛机械手
RljnPackagePalletSplitManipulatorDeviceDriver rljnPackagePalletSplitManipulatorDeviceDriver;
//嘉耐-码垛机械手工位
@@ -571,59 +509,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
jo.put("Htrapezoidal", lnshPalletizingManipulatorSiteDeviceDriver.getHtrapezoidal());
jo.put("Wthickness", lnshPalletizingManipulatorSiteDeviceDriver.getWthickness());
jo.put("batch", lnshPalletizingManipulatorSiteDeviceDriver.getBatch());
} else if (device.getDeviceDriver() instanceof LnshPackageSiteDeviceDriver) {
lnshPackageSiteDeviceDriver = (LnshPackageSiteDeviceDriver) device.getDeviceDriver();
jo.put("device_code", device.getDevice_code());
jo.put("mode", lnshPackageSiteDeviceDriver.getMode());
jo.put("move", lnshPackageSiteDeviceDriver.getMove());
jo.put("action", lnshPackageSiteDeviceDriver.getAction());
jo.put("io_action", lnshPackageSiteDeviceDriver.getIo_action());
jo.put("hasGoods", lnshPackageSiteDeviceDriver.getHasGoods());
jo.put("isOnline", lnshPackageSiteDeviceDriver.getIsonline());
jo.put("error", lnshPackageSiteDeviceDriver.getError());
jo.put("isError", lnshPackageSiteDeviceDriver.getIserror());
jo.put("message", lnshPackageSiteDeviceDriver.getMessage());
jo.put("task", lnshPackageSiteDeviceDriver.getTask());
jo.put("weight", lnshPackageSiteDeviceDriver.getWeight());
jo.put("material", lnshPackageSiteDeviceDriver.getMaterial());
jo.put("barcode", lnshPackageSiteDeviceDriver.getBarcode());
} else if (device.getDeviceDriver() instanceof LnshMixingMillDeviceDriver) {
lnshMixingMillDeviceDriver = (LnshMixingMillDeviceDriver) device.getDeviceDriver();
jo.put("device_code", device.getDevice_code());
jo.put("mode", lnshMixingMillDeviceDriver.getMode());
jo.put("status", lnshMixingMillDeviceDriver.getStatus());
jo.put("isOnline", lnshMixingMillDeviceDriver.getIsonline());
jo.put("error", lnshMixingMillDeviceDriver.getError());
jo.put("open_time", lnshMixingMillDeviceDriver.getOpen_time());
jo.put("standby_time", lnshMixingMillDeviceDriver.getStandby_time());
jo.put("production_time", lnshMixingMillDeviceDriver.getProduction_time());
jo.put("error_time", lnshMixingMillDeviceDriver.getError_time());
jo.put("isError", lnshMixingMillDeviceDriver.getIserror());
jo.put("message", lnshMixingMillDeviceDriver.getMessage());
jo.put("weight", lnshMixingMillDeviceDriver.getWeight());
jo.put("material", lnshMixingMillDeviceDriver.getMaterial());
jo.put("order_No", lnshMixingMillDeviceDriver.getOrder_No());
jo.put("mix_num", lnshMixingMillDeviceDriver.getMix_num());
} else if (device.getDeviceDriver() instanceof LnshPressDeviceDriver) {
lnshPressDeviceDriver = (LnshPressDeviceDriver) device.getDeviceDriver();
jo.put("device_code", device.getDevice_code());
jo.put("mode", lnshPressDeviceDriver.getMode());
jo.put("status", lnshPressDeviceDriver.getStatus());
jo.put("isOnline", lnshPressDeviceDriver.getIsonline());
jo.put("error", lnshPressDeviceDriver.getError());
jo.put("open_time", lnshPressDeviceDriver.getOpen_time());
jo.put("standby_time", lnshPressDeviceDriver.getStandby_time());
jo.put("production_time", lnshPressDeviceDriver.getProduction_time());
jo.put("error_time", lnshPressDeviceDriver.getError_time());
jo.put("isError", lnshPressDeviceDriver.getIserror());
jo.put("message", lnshPressDeviceDriver.getMessage());
jo.put("weight", lnshPressDeviceDriver.getWeight());
jo.put("qty", lnshPressDeviceDriver.getQty());
jo.put("material", lnshPressDeviceDriver.getMaterial());
jo.put("qualified", lnshPressDeviceDriver.getQualified());
jo.put("unqualified", lnshPressDeviceDriver.getUnqualified());
jo.put("order_No", lnshPressDeviceDriver.getOrder_No());
} else if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorDeviceDriver) {
} else if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorDeviceDriver) {
lnshPalletizingManipulatorDeviceDriver = (LnshPalletizingManipulatorDeviceDriver) device.getDeviceDriver();
jo.put("device_code", device.getDevice_code());
jo.put("mode", lnshPalletizingManipulatorDeviceDriver.getMode());
@@ -638,20 +524,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
jo.put("specifications", lnshPalletizingManipulatorDeviceDriver.getSpecifications());
jo.put("isError", lnshPalletizingManipulatorDeviceDriver.getIserror());
jo.put("message", lnshPalletizingManipulatorDeviceDriver.getMessage());
} else if (device.getDeviceDriver() instanceof LnshKilnTrussDeviceDriver) {
lnshKilnTrussDeviceDriver = (LnshKilnTrussDeviceDriver) device.getDeviceDriver();
jo.put("device_code", device.getDevice_code());
jo.put("mode", lnshKilnTrussDeviceDriver.getMode());
jo.put("status", lnshKilnTrussDeviceDriver.getStatus());
jo.put("isOnline", lnshKilnTrussDeviceDriver.getIsonline());
jo.put("error", lnshKilnTrussDeviceDriver.getError());
jo.put("open_time", lnshKilnTrussDeviceDriver.getOpen_time());
jo.put("standby_time", lnshKilnTrussDeviceDriver.getStandby_time());
jo.put("production_time", lnshKilnTrussDeviceDriver.getProduction_time());
jo.put("error_time", lnshKilnTrussDeviceDriver.getError_time());
jo.put("isError", lnshKilnTrussDeviceDriver.getIserror());
jo.put("message", lnshKilnTrussDeviceDriver.getMessage());
} else if (device.getDeviceDriver() instanceof LnshKilnLaneDeviceDriver) {
} else if (device.getDeviceDriver() instanceof LnshKilnLaneDeviceDriver) {
lnshKilnLaneDeviceDriver = (LnshKilnLaneDeviceDriver) device.getDeviceDriver();
jo.put("device_code", device.getDevice_code());
jo.put("mode", lnshKilnLaneDeviceDriver.getMode());
@@ -667,53 +540,6 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
jo.put("nullCar_qty", lnshKilnLaneDeviceDriver.getNullCar_qty());
jo.put("burning_car_qty", lnshKilnLaneDeviceDriver.getBurning_car_qty());
jo.put("message", lnshKilnLaneDeviceDriver.getMessage());
} else if (device.getDeviceDriver() instanceof LnshOutKilnTrussDeviceDriver) {
lnshOutKilnTrussDeviceDriver = (LnshOutKilnTrussDeviceDriver) device.getDeviceDriver();
jo.put("device_code", device.getDevice_code());
jo.put("mode", lnshOutKilnTrussDeviceDriver.getMode());
jo.put("status", lnshOutKilnTrussDeviceDriver.getStatus());
jo.put("isOnline", lnshOutKilnTrussDeviceDriver.getIsonline());
jo.put("error", lnshOutKilnTrussDeviceDriver.getError());
jo.put("outKiln_move", lnshOutKilnTrussDeviceDriver.getOutKiln_move());
jo.put("outKiln_barcode", lnshOutKilnTrussDeviceDriver.getOutKiln_barcode());
jo.put("outKiln_device", lnshOutKilnTrussDeviceDriver.getOutKiln_device());
jo.put("open_time", lnshOutKilnTrussDeviceDriver.getOpen_time());
jo.put("standby_time", lnshOutKilnTrussDeviceDriver.getStandby_time());
jo.put("production_time", lnshOutKilnTrussDeviceDriver.getProduction_time());
jo.put("error_time", lnshOutKilnTrussDeviceDriver.getError_time());
jo.put("isError", lnshOutKilnTrussDeviceDriver.getIserror());
jo.put("message", lnshOutKilnTrussDeviceDriver.getMessage());
} else if (device.getDeviceDriver() instanceof LnshFoldDiscSiteDeviceDriver) {
lnshFoldDiscSiteDeviceDriver = (LnshFoldDiscSiteDeviceDriver) device.getDeviceDriver();
jo.put("device_code", device.getDevice_code());
jo.put("mode", lnshFoldDiscSiteDeviceDriver.getMode());
jo.put("status", lnshFoldDiscSiteDeviceDriver.getStatus());
jo.put("isOnline", lnshFoldDiscSiteDeviceDriver.getIsonline());
jo.put("error", lnshFoldDiscSiteDeviceDriver.getError());
jo.put("open_time", lnshFoldDiscSiteDeviceDriver.getOpen_time());
jo.put("close_time", lnshFoldDiscSiteDeviceDriver.getClose_time());
jo.put("standby_time", lnshFoldDiscSiteDeviceDriver.getStandby_time());
jo.put("production_time", lnshFoldDiscSiteDeviceDriver.getProduction_time());
jo.put("error_time", lnshFoldDiscSiteDeviceDriver.getError_time());
jo.put("container_qty", lnshFoldDiscSiteDeviceDriver.getContainer_qty());
jo.put("isError", lnshFoldDiscSiteDeviceDriver.getIserror());
jo.put("message", lnshFoldDiscSiteDeviceDriver.getMessage());
} else if (device.getDeviceDriver() instanceof LnshPalletStorageDeviceDriver) {
lnshPalletStorageDeviceDriver = (LnshPalletStorageDeviceDriver) device.getDeviceDriver();
jo.put("device_code", device.getDevice_code());
jo.put("mode", lnshPalletStorageDeviceDriver.getMode());
jo.put("status", lnshPalletStorageDeviceDriver.getStatus());
jo.put("isOnline", lnshPalletStorageDeviceDriver.getIsonline());
jo.put("error", lnshPalletStorageDeviceDriver.getError());
jo.put("open_time", lnshPalletStorageDeviceDriver.getOpen_time());
jo.put("close_time", lnshPalletStorageDeviceDriver.getClose_time());
jo.put("standby_time", lnshPalletStorageDeviceDriver.getStandby_time());
jo.put("production_time", lnshPalletStorageDeviceDriver.getProduction_time());
jo.put("error_time", lnshPalletStorageDeviceDriver.getError_time());
jo.put("tray_crib_qty", lnshPalletStorageDeviceDriver.getTray_crib_qty());
jo.put("total_container", lnshPalletStorageDeviceDriver.getTotal_container());
jo.put("isError", lnshPalletStorageDeviceDriver.getIserror());
jo.put("message", lnshPalletStorageDeviceDriver.getMessage());
} else if (device.getDeviceDriver() instanceof LnshPackagePalletManipulatorDeviceDriver) {
lnshPackagePalletManipulatorDeviceDriver = (LnshPackagePalletManipulatorDeviceDriver) device.getDeviceDriver();
jo.put("device_code", device.getDevice_code());
@@ -791,19 +617,6 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
jo.put("error_time", lnshSplitManipulatorDeviceDriver.getError_time());
jo.put("isError", lnshSplitManipulatorDeviceDriver.getIserror());
jo.put("message", lnshSplitManipulatorDeviceDriver.getMessage());
} else if (device.getDeviceDriver() instanceof LnshPackageLineDeviceDriver) {
lnshPackageLineDeviceDriver = (LnshPackageLineDeviceDriver) device.getDeviceDriver();
jo.put("device_code", device.getDevice_code());
jo.put("mode", lnshPackageLineDeviceDriver.getMode());
jo.put("status", lnshPackageLineDeviceDriver.getStatus());
jo.put("isOnline", lnshPackageLineDeviceDriver.getIsonline());
jo.put("open_time", lnshPackageLineDeviceDriver.getOpen_time());
jo.put("standby_time", lnshPackageLineDeviceDriver.getStandby_time());
jo.put("production_time", lnshPackageLineDeviceDriver.getProduction_time());
jo.put("error_time", lnshPackageLineDeviceDriver.getError_time());
jo.put("barcode", lnshPackageLineDeviceDriver.getBarcode());
jo.put("isError", lnshPackageLineDeviceDriver.getIserror());
jo.put("message", lnshPackageLineDeviceDriver.getMessage());
} else if (device.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) {
lnshLaminatingMachineDeviceDriver = (LnshLaminatingMachineDeviceDriver) device.getDeviceDriver();
jo.put("device_code", device.getDevice_code());
@@ -976,58 +789,6 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
jo.put("Htrapezoidal", lnshPalletizingManipulatorSiteDeviceDriver.getHtrapezoidal());
jo.put("Wthickness", lnshPalletizingManipulatorSiteDeviceDriver.getWthickness());
jo.put("batch", lnshPalletizingManipulatorSiteDeviceDriver.getBatch());
} else if (device.getDeviceDriver() instanceof LnshPackageSiteDeviceDriver) {
lnshPackageSiteDeviceDriver = (LnshPackageSiteDeviceDriver) device.getDeviceDriver();
jo.put("device_code", device.getDevice_code());
jo.put("mode", lnshPackageSiteDeviceDriver.getMode());
jo.put("move", lnshPackageSiteDeviceDriver.getMove());
jo.put("action", lnshPackageSiteDeviceDriver.getAction());
jo.put("io_action", lnshPackageSiteDeviceDriver.getIo_action());
jo.put("hasGoods", lnshPackageSiteDeviceDriver.getHasGoods());
jo.put("isOnline", lnshPackageSiteDeviceDriver.getIsonline());
jo.put("error", lnshPackageSiteDeviceDriver.getError());
jo.put("isError", lnshPackageSiteDeviceDriver.getIserror());
jo.put("message", lnshPackageSiteDeviceDriver.getMessage());
jo.put("task", lnshPackageSiteDeviceDriver.getTask());
jo.put("weight", lnshPackageSiteDeviceDriver.getWeight());
jo.put("material", lnshPackageSiteDeviceDriver.getMaterial());
jo.put("barcode", lnshPackageSiteDeviceDriver.getBarcode());
} else if (device.getDeviceDriver() instanceof LnshMixingMillDeviceDriver) {
lnshMixingMillDeviceDriver = (LnshMixingMillDeviceDriver) device.getDeviceDriver();
jo.put("device_code", device.getDevice_code());
jo.put("mode", lnshMixingMillDeviceDriver.getMode());
jo.put("status", lnshMixingMillDeviceDriver.getStatus());
jo.put("isOnline", lnshMixingMillDeviceDriver.getIsonline());
jo.put("error", lnshMixingMillDeviceDriver.getError());
jo.put("open_time", lnshMixingMillDeviceDriver.getOpen_time());
jo.put("standby_time", lnshMixingMillDeviceDriver.getStandby_time());
jo.put("production_time", lnshMixingMillDeviceDriver.getProduction_time());
jo.put("error_time", lnshMixingMillDeviceDriver.getError_time());
jo.put("isError", lnshMixingMillDeviceDriver.getIserror());
jo.put("message", lnshMixingMillDeviceDriver.getMessage());
jo.put("weight", lnshMixingMillDeviceDriver.getWeight());
jo.put("material", lnshMixingMillDeviceDriver.getMaterial());
jo.put("order_No", lnshMixingMillDeviceDriver.getOrder_No());
jo.put("mix_num", lnshMixingMillDeviceDriver.getMix_num());
} else if (device.getDeviceDriver() instanceof LnshPressDeviceDriver) {
lnshPressDeviceDriver = (LnshPressDeviceDriver) device.getDeviceDriver();
jo.put("device_code", device.getDevice_code());
jo.put("mode", lnshPressDeviceDriver.getMode());
jo.put("status", lnshPressDeviceDriver.getStatus());
jo.put("isOnline", lnshPressDeviceDriver.getIsonline());
jo.put("error", lnshPressDeviceDriver.getError());
jo.put("open_time", lnshPressDeviceDriver.getOpen_time());
jo.put("standby_time", lnshPressDeviceDriver.getStandby_time());
jo.put("production_time", lnshPressDeviceDriver.getProduction_time());
jo.put("error_time", lnshPressDeviceDriver.getError_time());
jo.put("isError", lnshPressDeviceDriver.getIserror());
jo.put("message", lnshPressDeviceDriver.getMessage());
jo.put("weight", lnshPressDeviceDriver.getWeight());
jo.put("qty", lnshPressDeviceDriver.getQty());
jo.put("material", lnshPressDeviceDriver.getMaterial());
jo.put("qualified", lnshPressDeviceDriver.getQualified());
jo.put("unqualified", lnshPressDeviceDriver.getUnqualified());
jo.put("order_No", lnshPressDeviceDriver.getOrder_No());
} else if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorDeviceDriver) {
lnshPalletizingManipulatorDeviceDriver = (LnshPalletizingManipulatorDeviceDriver) device.getDeviceDriver();
jo.put("device_code", device.getDevice_code());
@@ -1043,19 +804,6 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
jo.put("specifications", lnshPalletizingManipulatorDeviceDriver.getSpecifications());
jo.put("isError", lnshPalletizingManipulatorDeviceDriver.getIserror());
jo.put("message", lnshPalletizingManipulatorDeviceDriver.getMessage());
} else if (device.getDeviceDriver() instanceof LnshKilnTrussDeviceDriver) {
lnshKilnTrussDeviceDriver = (LnshKilnTrussDeviceDriver) device.getDeviceDriver();
jo.put("device_code", device.getDevice_code());
jo.put("mode", lnshKilnTrussDeviceDriver.getMode());
jo.put("status", lnshKilnTrussDeviceDriver.getStatus());
jo.put("isOnline", lnshKilnTrussDeviceDriver.getIsonline());
jo.put("error", lnshKilnTrussDeviceDriver.getError());
jo.put("open_time", lnshKilnTrussDeviceDriver.getOpen_time());
jo.put("standby_time", lnshKilnTrussDeviceDriver.getStandby_time());
jo.put("production_time", lnshKilnTrussDeviceDriver.getProduction_time());
jo.put("error_time", lnshKilnTrussDeviceDriver.getError_time());
jo.put("isError", lnshKilnTrussDeviceDriver.getIserror());
jo.put("message", lnshKilnTrussDeviceDriver.getMessage());
} else if (device.getDeviceDriver() instanceof LnshKilnLaneDeviceDriver) {
lnshKilnLaneDeviceDriver = (LnshKilnLaneDeviceDriver) device.getDeviceDriver();
jo.put("device_code", device.getDevice_code());
@@ -1072,53 +820,6 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
jo.put("nullCar_qty", lnshKilnLaneDeviceDriver.getNullCar_qty());
jo.put("burning_car_qty", lnshKilnLaneDeviceDriver.getBurning_car_qty());
jo.put("message", lnshKilnLaneDeviceDriver.getMessage());
} else if (device.getDeviceDriver() instanceof LnshOutKilnTrussDeviceDriver) {
lnshOutKilnTrussDeviceDriver = (LnshOutKilnTrussDeviceDriver) device.getDeviceDriver();
jo.put("device_code", device.getDevice_code());
jo.put("mode", lnshOutKilnTrussDeviceDriver.getMode());
jo.put("status", lnshOutKilnTrussDeviceDriver.getStatus());
jo.put("isOnline", lnshOutKilnTrussDeviceDriver.getIsonline());
jo.put("error", lnshOutKilnTrussDeviceDriver.getError());
jo.put("outKiln_move", lnshOutKilnTrussDeviceDriver.getOutKiln_move());
jo.put("outKiln_barcode", lnshOutKilnTrussDeviceDriver.getOutKiln_barcode());
jo.put("outKiln_device", lnshOutKilnTrussDeviceDriver.getOutKiln_device());
jo.put("open_time", lnshOutKilnTrussDeviceDriver.getOpen_time());
jo.put("standby_time", lnshOutKilnTrussDeviceDriver.getStandby_time());
jo.put("production_time", lnshOutKilnTrussDeviceDriver.getProduction_time());
jo.put("error_time", lnshOutKilnTrussDeviceDriver.getError_time());
jo.put("isError", lnshOutKilnTrussDeviceDriver.getIserror());
jo.put("message", lnshOutKilnTrussDeviceDriver.getMessage());
} else if (device.getDeviceDriver() instanceof LnshFoldDiscSiteDeviceDriver) {
lnshFoldDiscSiteDeviceDriver = (LnshFoldDiscSiteDeviceDriver) device.getDeviceDriver();
jo.put("device_code", device.getDevice_code());
jo.put("mode", lnshFoldDiscSiteDeviceDriver.getMode());
jo.put("status", lnshFoldDiscSiteDeviceDriver.getStatus());
jo.put("isOnline", lnshFoldDiscSiteDeviceDriver.getIsonline());
jo.put("error", lnshFoldDiscSiteDeviceDriver.getError());
jo.put("open_time", lnshFoldDiscSiteDeviceDriver.getOpen_time());
jo.put("close_time", lnshFoldDiscSiteDeviceDriver.getClose_time());
jo.put("standby_time", lnshFoldDiscSiteDeviceDriver.getStandby_time());
jo.put("production_time", lnshFoldDiscSiteDeviceDriver.getProduction_time());
jo.put("error_time", lnshFoldDiscSiteDeviceDriver.getError_time());
jo.put("container_qty", lnshFoldDiscSiteDeviceDriver.getContainer_qty());
jo.put("isError", lnshFoldDiscSiteDeviceDriver.getIserror());
jo.put("message", lnshFoldDiscSiteDeviceDriver.getMessage());
} else if (device.getDeviceDriver() instanceof LnshPalletStorageDeviceDriver) {
lnshPalletStorageDeviceDriver = (LnshPalletStorageDeviceDriver) device.getDeviceDriver();
jo.put("device_code", device.getDevice_code());
jo.put("mode", lnshPalletStorageDeviceDriver.getMode());
jo.put("status", lnshPalletStorageDeviceDriver.getStatus());
jo.put("isOnline", lnshPalletStorageDeviceDriver.getIsonline());
jo.put("error", lnshPalletStorageDeviceDriver.getError());
jo.put("open_time", lnshPalletStorageDeviceDriver.getOpen_time());
jo.put("close_time", lnshPalletStorageDeviceDriver.getClose_time());
jo.put("standby_time", lnshPalletStorageDeviceDriver.getStandby_time());
jo.put("production_time", lnshPalletStorageDeviceDriver.getProduction_time());
jo.put("error_time", lnshPalletStorageDeviceDriver.getError_time());
jo.put("tray_crib_qty", lnshPalletStorageDeviceDriver.getTray_crib_qty());
jo.put("total_container", lnshPalletStorageDeviceDriver.getTotal_container());
jo.put("isError", lnshPalletStorageDeviceDriver.getIserror());
jo.put("message", lnshPalletStorageDeviceDriver.getMessage());
} else if (device.getDeviceDriver() instanceof LnshPackagePalletManipulatorDeviceDriver) {
lnshPackagePalletManipulatorDeviceDriver = (LnshPackagePalletManipulatorDeviceDriver) device.getDeviceDriver();
jo.put("device_code", device.getDevice_code());
@@ -1196,19 +897,6 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
jo.put("error_time", lnshSplitManipulatorDeviceDriver.getError_time());
jo.put("isError", lnshSplitManipulatorDeviceDriver.getIserror());
jo.put("message", lnshSplitManipulatorDeviceDriver.getMessage());
} else if (device.getDeviceDriver() instanceof LnshPackageLineDeviceDriver) {
lnshPackageLineDeviceDriver = (LnshPackageLineDeviceDriver) device.getDeviceDriver();
jo.put("device_code", device.getDevice_code());
jo.put("mode", lnshPackageLineDeviceDriver.getMode());
jo.put("status", lnshPackageLineDeviceDriver.getStatus());
jo.put("isOnline", lnshPackageLineDeviceDriver.getIsonline());
jo.put("open_time", lnshPackageLineDeviceDriver.getOpen_time());
jo.put("standby_time", lnshPackageLineDeviceDriver.getStandby_time());
jo.put("production_time", lnshPackageLineDeviceDriver.getProduction_time());
jo.put("error_time", lnshPackageLineDeviceDriver.getError_time());
jo.put("barcode", lnshPackageLineDeviceDriver.getBarcode());
jo.put("isError", lnshPackageLineDeviceDriver.getIserror());
jo.put("message", lnshPackageLineDeviceDriver.getMessage());
} else if (device.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) {
lnshLaminatingMachineDeviceDriver = (LnshLaminatingMachineDeviceDriver) device.getDeviceDriver();
jo.put("device_code", device.getDevice_code());

View File

@@ -14,20 +14,12 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.acs.device_driver.electric_fence.ElectricFenceDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_Laminating_machine.LnshLaminatingMachineDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_fold_disc_site.LnshFoldDiscSiteDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_kiln_lane.LnshKilnLaneDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_kiln_truss.LnshKilnTrussDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_labeling_machine.LnshLabelingMachineDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_mixing_mill.LnshMixingMillDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_one_rgv.LnshOneRGVDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_out_kiln_truss.LnshOutKilnTrussDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_package_line.LnshPackageLineDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_package_pallet_manipulator.LnshPackagePalletManipulatorDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_package_site.LnshPackageSiteDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_pallet_storage.LnshPalletStorageDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_palletizing_manipulator.LnshPalletizingManipulatorDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_palletizing_manipulator_site.LnshPalletizingManipulatorSiteDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_press.LnshPressDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_rgv.LnshRGVDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_split_manipulator.LnshSplitManipulatorDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_station.LnshStationDeviceDriver;
@@ -344,22 +336,10 @@ public class StageActorServiceImpl implements StageActorService {
StandardRGVDeviceDriver standardRGVDeviceDriver;
//电子围栏
ElectricFenceDeviceDriver electricFenceDeviceDriver;
//晟华-混碾机
LnshMixingMillDeviceDriver lnshMixingMillDeviceDriver;
//晟华-压力机
LnshPressDeviceDriver lnshPressDeviceDriver;
//嘉耐-码垛机械手
LnshPalletizingManipulatorDeviceDriver lnshPalletizingManipulatorDeviceDriver;
//嘉耐-窑车道
LnshKilnLaneDeviceDriver lnshKilnLaneDeviceDriver;
//晟华-入出窑桁架
LnshKilnTrussDeviceDriver lnshKilnTrussDeviceDriver;
//晟华-出窑桁架
LnshOutKilnTrussDeviceDriver lnshOutKilnTrussDeviceDriver;
//晟华-叠盘工位
LnshFoldDiscSiteDeviceDriver lnshFoldDiscSiteDeviceDriver;
//晟华-托盘存储线
LnshPalletStorageDeviceDriver lnshPalletStorageDeviceDriver;
//嘉耐-包装码垛机械手
LnshPackagePalletManipulatorDeviceDriver lnshPackagePalletManipulatorDeviceDriver;
//晟华-贴标机
@@ -370,14 +350,10 @@ public class StageActorServiceImpl implements StageActorService {
LnshRGVDeviceDriver lnshRGVDeviceDriver;
//嘉耐单工位RGV
LnshOneRGVDeviceDriver lnshOneRGVDeviceDriver;
//晟华-包装线
LnshPackageLineDeviceDriver lnshPackageLineDeviceDriver;
//嘉耐-工位(交互模板)
LnshStationDeviceDriver lnshStationDeviceDriver;
//嘉耐-缓存货架
LnshLaminatingMachineDeviceDriver lnshLaminatingMachineDeviceDriver;
//嘉耐-包装线工位
LnshPackageSiteDeviceDriver lnshPackageSiteDeviceDriver;
//嘉耐-包装码拆垛机械手
RljnPackagePalletSplitManipulatorDeviceDriver rljnPackagePalletSplitManipulatorDeviceDriver;
//嘉耐-码垛机械手工位
@@ -1090,142 +1066,7 @@ public class StageActorServiceImpl implements StageActorService {
jo.put("Htrapezoidal", lnshPalletizingManipulatorSiteDeviceDriver.getHtrapezoidal());
jo.put("Wthickness", lnshPalletizingManipulatorSiteDeviceDriver.getWthickness());
jo.put("batch", lnshPalletizingManipulatorSiteDeviceDriver.getBatch());
} else if (device.getDeviceDriver() instanceof LnshPackageSiteDeviceDriver) {
lnshPackageSiteDeviceDriver = (LnshPackageSiteDeviceDriver) device.getDeviceDriver();
if (lnshPackageSiteDeviceDriver.getMode() == 0) {
mode = "未联机";
} else if (lnshPackageSiteDeviceDriver.getMode() == 1) {
mode = "单机";
} else if (lnshPackageSiteDeviceDriver.getMode() == 2) {
mode = "联机";
} else if (lnshPackageSiteDeviceDriver.getMode() == 4) {
mode = "叫料";
} else if (lnshPackageSiteDeviceDriver.getMode() == 5) {
mode = "申请空盘";
} else if (lnshPackageSiteDeviceDriver.getMode() == 6) {
mode = "申请入库";
}
if (lnshPackageSiteDeviceDriver.getAction() == 0) {
action = "禁止取放";
} else if (lnshPackageSiteDeviceDriver.getAction() == 1) {
action = "允许取货";
} else if (lnshPackageSiteDeviceDriver.getAction() == 2) {
action = "允许放货";
} else if (lnshPackageSiteDeviceDriver.getAction() == 3) {
action = "允许取放";
}
if (lnshPackageSiteDeviceDriver.getIo_action() == 0) {
io_action = "禁止进出";
} else if (lnshPackageSiteDeviceDriver.getIo_action() == 1) {
io_action = "允许进入";
} else if (lnshPackageSiteDeviceDriver.getIo_action() == 2) {
io_action = "允许离开";
} else if (lnshPackageSiteDeviceDriver.getIo_action() == 3) {
io_action = "允许进出";
}
if (lnshPackageSiteDeviceDriver.getMove() == 0) {
move = "无货";
} else if (lnshPackageSiteDeviceDriver.getMove() == 1) {
move = "有货";
} else if (lnshPackageSiteDeviceDriver.getMove() == 2) {
move = "有托盘有货";
}
obj.put("device_name", lnshPackageSiteDeviceDriver.getDevice().getDevice_name());
jo.put("mode", mode);
jo.put("move", move);
jo.put("action", action);
jo.put("io_action", io_action);
jo.put("hasGoods", lnshPackageSiteDeviceDriver.getHasGoods());
jo.put("isOnline", lnshPackageSiteDeviceDriver.getIsonline());
jo.put("error", lnshPackageSiteDeviceDriver.getError());
jo.put("isError", lnshPackageSiteDeviceDriver.getIserror());
jo.put("message", lnshPackageSiteDeviceDriver.getMessage());
jo.put("task", lnshPackageSiteDeviceDriver.getTask());
jo.put("weight", lnshPackageSiteDeviceDriver.getWeight());
jo.put("material", lnshPackageSiteDeviceDriver.getMaterial());
jo.put("barcode", lnshPackageSiteDeviceDriver.getBarcode());
}
else if (device.getDeviceDriver() instanceof LnshMixingMillDeviceDriver) {
lnshMixingMillDeviceDriver = (LnshMixingMillDeviceDriver) device.getDeviceDriver();
if (lnshMixingMillDeviceDriver.getMode() == 0) {
mode = "未联机";
} else if (lnshMixingMillDeviceDriver.getMode() == 1) {
mode = "单机";
} else if (lnshMixingMillDeviceDriver.getMode() == 2) {
mode = "联机";
} else if (lnshMixingMillDeviceDriver.getMode() == 3) {
mode = "人工排产确认";
} else if (lnshMixingMillDeviceDriver.getMode() == 4) {
mode = "工单完成";
}
if (lnshMixingMillDeviceDriver.getStatus() == 1) {
status = "待机";
} else if (lnshMixingMillDeviceDriver.getStatus() == 2) {
status = "生产中";
} else if (lnshMixingMillDeviceDriver.getStatus() == 3) {
status = "故障";
}
obj.put("device_name", lnshMixingMillDeviceDriver.getDevice().getDevice_name());
jo.put("mode", mode);
jo.put("status", status);
jo.put("isOnline", lnshMixingMillDeviceDriver.getIsonline());
jo.put("error", lnshMixingMillDeviceDriver.getError());
jo.put("open_time", lnshMixingMillDeviceDriver.getOpen_time());
jo.put("standby_time", lnshMixingMillDeviceDriver.getStandby_time());
jo.put("production_time", lnshMixingMillDeviceDriver.getProduction_time());
jo.put("error_time", lnshMixingMillDeviceDriver.getError_time());
jo.put("isError", lnshMixingMillDeviceDriver.getIserror());
jo.put("message", lnshMixingMillDeviceDriver.getMessage());
jo.put("weight", lnshMixingMillDeviceDriver.getWeight());
jo.put("material", lnshMixingMillDeviceDriver.getMaterial());
jo.put("order_No", lnshMixingMillDeviceDriver.getOrder_No());
jo.put("mix_num", lnshMixingMillDeviceDriver.getMix_num());
}
else if (device.getDeviceDriver() instanceof LnshPressDeviceDriver ) {
lnshPressDeviceDriver = (LnshPressDeviceDriver ) device.getDeviceDriver();
if (lnshPressDeviceDriver.getMode() == 0) {
mode = "未联机";
} else if (lnshPressDeviceDriver.getMode() == 1) {
mode = "单机";
} else if (lnshPressDeviceDriver.getMode() == 2) {
mode = "联机";
} else if (lnshPressDeviceDriver.getMode() == 3) {
mode = "人工排产确认";
} else if (lnshPressDeviceDriver.getMode() == 4) {
mode = "工单完成";
}
if (lnshPressDeviceDriver.getStatus() == 1) {
status = "待机";
} else if (lnshPressDeviceDriver.getStatus() == 2) {
status = "生产中";
} else if (lnshPressDeviceDriver.getStatus() == 3) {
status = "故障";
}
obj.put("device_name", lnshPressDeviceDriver.getDevice().getDevice_name());
jo.put("mode", mode);
jo.put("status", status);
jo.put("isOnline", lnshPressDeviceDriver.getIsonline());
jo.put("error", lnshPressDeviceDriver.getError());
jo.put("open_time", lnshPressDeviceDriver.getOpen_time());
jo.put("standby_time", lnshPressDeviceDriver.getStandby_time());
jo.put("production_time", lnshPressDeviceDriver.getProduction_time());
jo.put("error_time", lnshPressDeviceDriver.getError_time());
jo.put("isError", lnshPressDeviceDriver.getIserror());
jo.put("message", lnshPressDeviceDriver.getMessage());
jo.put("weight", lnshPressDeviceDriver.getWeight());
jo.put("qty", lnshPressDeviceDriver.getQty());
jo.put("material", lnshPressDeviceDriver.getMaterial());
jo.put("qualified", lnshPressDeviceDriver.getQualified());
jo.put("unqualified", lnshPressDeviceDriver.getUnqualified());
jo.put("order_No", lnshPressDeviceDriver.getOrder_No());
}
else if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorDeviceDriver) {
} else if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorDeviceDriver) {
lnshPalletizingManipulatorDeviceDriver = (LnshPalletizingManipulatorDeviceDriver) device.getDeviceDriver();
if (lnshPalletizingManipulatorDeviceDriver.getMode() == 0) {
mode = "未联机";
@@ -1276,40 +1117,7 @@ public class StageActorServiceImpl implements StageActorService {
jo.put("batch", lnshPalletizingManipulatorDeviceDriver.getBatch());
jo.put("isError", lnshPalletizingManipulatorDeviceDriver.getIserror());
jo.put("message", lnshPalletizingManipulatorDeviceDriver.getMessage());
}
else if (device.getDeviceDriver() instanceof LnshKilnTrussDeviceDriver) {
lnshKilnTrussDeviceDriver = (LnshKilnTrussDeviceDriver) device.getDeviceDriver();
if (lnshKilnTrussDeviceDriver.getMode() == 0) {
mode = "未联机";
} else if (lnshKilnTrussDeviceDriver.getMode() == 1) {
mode = "单机";
} else if (lnshKilnTrussDeviceDriver.getMode() == 2) {
mode = "联机";
} else if (lnshKilnTrussDeviceDriver.getMode() == 3) {
mode = "运行中";
}
if (lnshKilnTrussDeviceDriver.getStatus() == 1) {
status = "待机";
} else if (lnshKilnTrussDeviceDriver.getStatus() == 2) {
status = "生产中";
} else if (lnshKilnTrussDeviceDriver.getStatus() == 3) {
status = "故障";
}
obj.put("device_name", lnshKilnTrussDeviceDriver.getDevice().getDevice_name());
jo.put("mode", mode);
jo.put("status", status);
jo.put("isOnline", lnshKilnTrussDeviceDriver.getIsonline());
jo.put("error", lnshKilnTrussDeviceDriver.getError());
jo.put("open_time", lnshKilnTrussDeviceDriver.getOpen_time());
jo.put("standby_time", lnshKilnTrussDeviceDriver.getStandby_time());
jo.put("production_time", lnshKilnTrussDeviceDriver.getProduction_time());
jo.put("error_time", lnshKilnTrussDeviceDriver.getError_time());
jo.put("isError", lnshKilnTrussDeviceDriver.getIserror());
jo.put("message", lnshKilnTrussDeviceDriver.getMessage());
}
else if (device.getDeviceDriver() instanceof LnshKilnLaneDeviceDriver) {
} else if (device.getDeviceDriver() instanceof LnshKilnLaneDeviceDriver) {
lnshKilnLaneDeviceDriver = (LnshKilnLaneDeviceDriver) device.getDeviceDriver();
if (lnshKilnLaneDeviceDriver.getMode() == 0) {
mode = "未联机";
@@ -1341,112 +1149,7 @@ public class StageActorServiceImpl implements StageActorService {
jo.put("nullCar_qty", lnshKilnLaneDeviceDriver.getNullCar_qty());
jo.put("burning_car_qty", lnshKilnLaneDeviceDriver.getBurning_car_qty());
jo.put("message", lnshKilnLaneDeviceDriver.getMessage());
}
else if (device.getDeviceDriver() instanceof LnshOutKilnTrussDeviceDriver) {
lnshOutKilnTrussDeviceDriver = (LnshOutKilnTrussDeviceDriver) device.getDeviceDriver();
if (lnshOutKilnTrussDeviceDriver.getMode() == 0) {
mode = "未联机";
} else if (lnshOutKilnTrussDeviceDriver.getMode() == 1) {
mode = "单机";
} else if (lnshOutKilnTrussDeviceDriver.getMode() == 2) {
mode = "联机";
} else if (lnshOutKilnTrussDeviceDriver.getMode() == 3) {
mode = "运行中";
}
if (lnshOutKilnTrussDeviceDriver.getStatus() == 1) {
status = "待机";
} else if (lnshOutKilnTrussDeviceDriver.getStatus() == 2) {
status = "生产中";
} else if (lnshOutKilnTrussDeviceDriver.getStatus() == 3) {
status = "故障";
}
obj.put("device_name", lnshOutKilnTrussDeviceDriver.getDevice().getDevice_name());
jo.put("mode", mode);
jo.put("status", status);
jo.put("isOnline", lnshOutKilnTrussDeviceDriver.getIsonline());
jo.put("error", lnshOutKilnTrussDeviceDriver.getError());
jo.put("outKiln_move", lnshOutKilnTrussDeviceDriver.getOutKiln_move());
jo.put("outKiln_barcode", lnshOutKilnTrussDeviceDriver.getOutKiln_barcode());
jo.put("outKiln_device", lnshOutKilnTrussDeviceDriver.getOutKiln_device());
jo.put("open_time", lnshOutKilnTrussDeviceDriver.getOpen_time());
jo.put("standby_time", lnshOutKilnTrussDeviceDriver.getStandby_time());
jo.put("production_time", lnshOutKilnTrussDeviceDriver.getProduction_time());
jo.put("error_time", lnshOutKilnTrussDeviceDriver.getError_time());
jo.put("isError", lnshOutKilnTrussDeviceDriver.getIserror());
jo.put("message", lnshOutKilnTrussDeviceDriver.getMessage());
}
else if (device.getDeviceDriver() instanceof LnshFoldDiscSiteDeviceDriver) {
lnshFoldDiscSiteDeviceDriver = (LnshFoldDiscSiteDeviceDriver) device.getDeviceDriver();
if (lnshFoldDiscSiteDeviceDriver.getMode() == 0) {
mode = "未联机";
} else if (lnshFoldDiscSiteDeviceDriver.getMode() == 1) {
mode = "单机";
} else if (lnshFoldDiscSiteDeviceDriver.getMode() == 2) {
mode = "联机";
} else if (lnshFoldDiscSiteDeviceDriver.getMode() == 3) {
mode = "运行中";
}
if (lnshFoldDiscSiteDeviceDriver.getStatus() == 1) {
status = "待机";
} else if (lnshFoldDiscSiteDeviceDriver.getStatus() == 2) {
status = "生产中";
} else if (lnshFoldDiscSiteDeviceDriver.getStatus() == 3) {
status = "故障";
}
obj.put("device_name", lnshFoldDiscSiteDeviceDriver.getDevice().getDevice_name());
jo.put("mode", mode);
jo.put("status", status);
jo.put("isOnline", lnshFoldDiscSiteDeviceDriver.getIsonline());
jo.put("error", lnshFoldDiscSiteDeviceDriver.getError());
jo.put("open_time", lnshFoldDiscSiteDeviceDriver.getOpen_time());
jo.put("close_time", lnshFoldDiscSiteDeviceDriver.getClose_time());
jo.put("standby_time", lnshFoldDiscSiteDeviceDriver.getStandby_time());
jo.put("production_time", lnshFoldDiscSiteDeviceDriver.getProduction_time());
jo.put("error_time", lnshFoldDiscSiteDeviceDriver.getError_time());
jo.put("container_qty", lnshFoldDiscSiteDeviceDriver.getContainer_qty());
jo.put("isError", lnshFoldDiscSiteDeviceDriver.getIserror());
jo.put("message", lnshFoldDiscSiteDeviceDriver.getMessage());
}
else if (device.getDeviceDriver() instanceof LnshPalletStorageDeviceDriver) {
lnshPalletStorageDeviceDriver = (LnshPalletStorageDeviceDriver) device.getDeviceDriver();
if (lnshPalletStorageDeviceDriver.getMode() == 0) {
mode = "未联机";
} else if (lnshPalletStorageDeviceDriver.getMode() == 1) {
mode = "单机";
} else if (lnshPalletStorageDeviceDriver.getMode() == 2) {
mode = "联机";
} else if (lnshPalletStorageDeviceDriver.getMode() == 3) {
mode = "运行中";
}
if (lnshPalletStorageDeviceDriver.getStatus() == 1) {
status = "待机";
} else if (lnshPalletStorageDeviceDriver.getStatus() == 2) {
status = "生产中";
} else if (lnshPalletStorageDeviceDriver.getStatus() == 3) {
status = "故障";
}
obj.put("device_name", lnshPalletStorageDeviceDriver.getDevice().getDevice_name());
jo.put("mode", mode);
jo.put("status", status);
jo.put("isOnline", lnshPalletStorageDeviceDriver.getIsonline());
jo.put("error", lnshPalletStorageDeviceDriver.getError());
jo.put("open_time", lnshPalletStorageDeviceDriver.getOpen_time());
jo.put("close_time", lnshPalletStorageDeviceDriver.getClose_time());
jo.put("standby_time", lnshPalletStorageDeviceDriver.getStandby_time());
jo.put("production_time", lnshPalletStorageDeviceDriver.getProduction_time());
jo.put("error_time", lnshPalletStorageDeviceDriver.getError_time());
jo.put("tray_crib_qty", lnshPalletStorageDeviceDriver.getTray_crib_qty());
jo.put("total_container", lnshPalletStorageDeviceDriver.getTotal_container());
jo.put("isError", lnshPalletStorageDeviceDriver.getIserror());
jo.put("message", lnshPalletStorageDeviceDriver.getMessage());
}
else if (device.getDeviceDriver() instanceof LnshPackagePalletManipulatorDeviceDriver) {
} else if (device.getDeviceDriver() instanceof LnshPackagePalletManipulatorDeviceDriver) {
lnshPackagePalletManipulatorDeviceDriver = (LnshPackagePalletManipulatorDeviceDriver) device.getDeviceDriver();
if (lnshPackagePalletManipulatorDeviceDriver.getMode() == 0) {
mode = "未联机";
@@ -1602,40 +1305,7 @@ public class StageActorServiceImpl implements StageActorService {
jo.put("onoff_status", onoff_status);
jo.put("isError", lnshSplitManipulatorDeviceDriver.getIserror());
jo.put("message", lnshSplitManipulatorDeviceDriver.getMessage());
}
else if (device.getDeviceDriver() instanceof LnshPackageLineDeviceDriver) {
lnshPackageLineDeviceDriver = (LnshPackageLineDeviceDriver) device.getDeviceDriver();
if (lnshPackageLineDeviceDriver.getMode() == 0) {
mode = "未联机";
} else if (lnshPackageLineDeviceDriver.getMode() == 1) {
mode = "单机";
} else if (lnshPackageLineDeviceDriver.getMode() == 2) {
mode = "联机";
} else if (lnshPackageLineDeviceDriver.getMode() == 3) {
mode = "运行中";
}
if (lnshPackageLineDeviceDriver.getStatus() == 1) {
status = "待机";
} else if (lnshPackageLineDeviceDriver.getStatus() == 2) {
status = "生产中";
} else if (lnshPackageLineDeviceDriver.getStatus() == 3) {
status = "故障";
}
obj.put("device_name", lnshPackageLineDeviceDriver.getDevice().getDevice_name());
jo.put("mode", mode);
jo.put("status", status);
jo.put("isOnline", lnshPackageLineDeviceDriver.getIsonline());
jo.put("open_time", lnshPackageLineDeviceDriver.getOpen_time());
jo.put("standby_time", lnshPackageLineDeviceDriver.getStandby_time());
jo.put("production_time", lnshPackageLineDeviceDriver.getProduction_time());
jo.put("error_time", lnshPackageLineDeviceDriver.getError_time());
jo.put("barcode", lnshPackageLineDeviceDriver.getBarcode());
jo.put("isError", lnshPackageLineDeviceDriver.getIserror());
jo.put("message", lnshPackageLineDeviceDriver.getMessage());
}
else if (device.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) {
} else if (device.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) {
lnshLaminatingMachineDeviceDriver = (LnshLaminatingMachineDeviceDriver) device.getDeviceDriver();
if (lnshLaminatingMachineDeviceDriver.getMode() == 0) {
mode = "未联机";