From 232adee0dd1ba1161f2ee25e5e48dcf0e7b16ac2 Mon Sep 17 00:00:00 2001 From: "USER-20220102CG\\noblelift" <546428999@qq.com> Date: Wed, 7 Sep 2022 10:24:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../acs/agv/server/impl/AgvServiceImpl.java | 12 - .../agv/server/impl/MagicAgvServiceImpl.java | 80 +-- .../wms/service/impl/WmsToAcsServiceImpl.java | 464 +------------- .../service/impl/InstructionServiceImpl.java | 7 - .../service/impl/StageServiceImpl.java | 567 +---------------- acs/qd/src/views/acs/device/config.vue | 30 +- .../driver/feedback_agv_status_site.vue | 331 ---------- .../driver/lnsh/lnsh_Laminating_machine.vue | 494 --------------- .../acs/device/driver/lnsh/lnsh_crusher.vue | 474 -------------- .../driver/lnsh/lnsh_fold_disc_site.vue | 488 --------------- .../acs/device/driver/lnsh/lnsh_kiln_lane.vue | 488 --------------- .../device/driver/lnsh/lnsh_kiln_truss.vue | 488 --------------- .../driver/lnsh/lnsh_labeling_machine.vue | 486 --------------- .../device/driver/lnsh/lnsh_mixing_mill.vue | 518 --------------- .../driver/lnsh/lnsh_out_kiln_truss.vue | 488 --------------- .../device/driver/lnsh/lnsh_package_line.vue | 488 --------------- .../lnsh/lnsh_package_pallet_manipulator.vue | 488 --------------- .../device/driver/lnsh/lnsh_package_site.vue | 474 -------------- .../driver/lnsh/lnsh_pallet_storage.vue | 488 --------------- .../lnsh/lnsh_palletizing_manipulator.vue | 488 --------------- .../acs/device/driver/lnsh/lnsh_press.vue | 488 --------------- .../views/acs/device/driver/lnsh/lnsh_rgv.vue | 589 ------------------ .../driver/lnsh/lnsh_split_manipulator.vue | 488 --------------- .../acs/device/driver/lnsh/lnsh_station.vue | 471 -------------- .../views/acs/device/driver/ndxy_special.vue | 507 --------------- .../acs/device/driver/ndxy_special_two.vue | 487 --------------- .../device/driver/non_line_inspect_site.vue | 220 ------- .../non_line_manipulator_inspect_site.vue | 220 ------- .../device/driver/special_ordinary_site.vue | 221 ------- .../acs/device/driver/whxr/whxr_ball_mill.vue | 351 ----------- .../device/driver/whxr/whxr_spary_power.vue | 351 ----------- .../driver/whxr/whxr_storage_conveyor.vue | 122 ---- .../acs/device/driver/whxr/whxr_weight.vue | 351 ----------- 33 files changed, 4 insertions(+), 12703 deletions(-) delete mode 100644 acs/qd/src/views/acs/device/driver/feedback_agv_status_site.vue delete mode 100644 acs/qd/src/views/acs/device/driver/lnsh/lnsh_Laminating_machine.vue delete mode 100644 acs/qd/src/views/acs/device/driver/lnsh/lnsh_crusher.vue delete mode 100644 acs/qd/src/views/acs/device/driver/lnsh/lnsh_fold_disc_site.vue delete mode 100644 acs/qd/src/views/acs/device/driver/lnsh/lnsh_kiln_lane.vue delete mode 100644 acs/qd/src/views/acs/device/driver/lnsh/lnsh_kiln_truss.vue delete mode 100644 acs/qd/src/views/acs/device/driver/lnsh/lnsh_labeling_machine.vue delete mode 100644 acs/qd/src/views/acs/device/driver/lnsh/lnsh_mixing_mill.vue delete mode 100644 acs/qd/src/views/acs/device/driver/lnsh/lnsh_out_kiln_truss.vue delete mode 100644 acs/qd/src/views/acs/device/driver/lnsh/lnsh_package_line.vue delete mode 100644 acs/qd/src/views/acs/device/driver/lnsh/lnsh_package_pallet_manipulator.vue delete mode 100644 acs/qd/src/views/acs/device/driver/lnsh/lnsh_package_site.vue delete mode 100644 acs/qd/src/views/acs/device/driver/lnsh/lnsh_pallet_storage.vue delete mode 100644 acs/qd/src/views/acs/device/driver/lnsh/lnsh_palletizing_manipulator.vue delete mode 100644 acs/qd/src/views/acs/device/driver/lnsh/lnsh_press.vue delete mode 100644 acs/qd/src/views/acs/device/driver/lnsh/lnsh_rgv.vue delete mode 100644 acs/qd/src/views/acs/device/driver/lnsh/lnsh_split_manipulator.vue delete mode 100644 acs/qd/src/views/acs/device/driver/lnsh/lnsh_station.vue delete mode 100644 acs/qd/src/views/acs/device/driver/ndxy_special.vue delete mode 100644 acs/qd/src/views/acs/device/driver/ndxy_special_two.vue delete mode 100644 acs/qd/src/views/acs/device/driver/non_line_inspect_site.vue delete mode 100644 acs/qd/src/views/acs/device/driver/non_line_manipulator_inspect_site.vue delete mode 100644 acs/qd/src/views/acs/device/driver/special_ordinary_site.vue delete mode 100644 acs/qd/src/views/acs/device/driver/whxr/whxr_ball_mill.vue delete mode 100644 acs/qd/src/views/acs/device/driver/whxr/whxr_spary_power.vue delete mode 100644 acs/qd/src/views/acs/device/driver/whxr/whxr_storage_conveyor.vue delete mode 100644 acs/qd/src/views/acs/device/driver/whxr/whxr_weight.vue diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java index aa6c668..ee473ac 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java @@ -10,7 +10,6 @@ import org.nl.acs.agv.server.AgvService; import org.nl.acs.agv.server.dto.AgvDto; import org.nl.acs.config.AcsConfig; import org.nl.acs.config.server.AcsConfigService; -import org.nl.acs.device_driver.lnsh.lnsh_station.LnshStationDeviceDriver; import org.nl.acs.device_driver.standard_autodoor.StandardAutodoorDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.service.InstructionService; @@ -97,7 +96,6 @@ public class AgvServiceImpl implements AgvService { break; default: StandardAutodoorDeviceDriver autodoor; - LnshStationDeviceDriver lnshStationDeviceDriver; Device device = deviceAppService.findDeviceByCode(device_code); if (ObjectUtil.isEmpty(device)) { throw new BadRequestException("未找到对应设备"); @@ -113,17 +111,7 @@ public class AgvServiceImpl implements AgvService { log.info("下发关门请求"); } } - if (device.getDeviceDriver() instanceof LnshStationDeviceDriver) { - lnshStationDeviceDriver = (LnshStationDeviceDriver) device.getDeviceDriver(); - if (StrUtil.equals("open", param)) { - lnshStationDeviceDriver.OpenOrClose("1"); - log.info("下发进入区域"); - } else if (StrUtil.equals("close", param)) { - lnshStationDeviceDriver.OpenOrClose("2"); - log.info("下发离开区域"); - } - } break; } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java index bb737c6..f6fbbcb 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java @@ -12,7 +12,6 @@ import org.nl.acs.agv.server.MagicAgvService; import org.nl.acs.agv.server.dto.AgvDto; import org.nl.acs.config.AcsConfig; import org.nl.acs.config.server.AcsConfigService; -import org.nl.acs.device_driver.lnsh.lnsh_station.LnshStationDeviceDriver; import org.nl.acs.device_driver.standard_autodoor.StandardAutodoorDeviceDriver; import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver; import org.nl.acs.device_driver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; @@ -417,7 +416,6 @@ public class MagicAgvServiceImpl implements MagicAgvService { Device addressdevice = appService.findDeviceByCode(address); StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver; StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver; - LnshStationDeviceDriver lnshStationDeviceDriver; //请求进入 if ("onEntry".equals(type)) { @@ -438,41 +436,6 @@ public class MagicAgvServiceImpl implements MagicAgvService { } } } - //晟华工位模板 - if (addressdevice.getDeviceDriver() instanceof LnshStationDeviceDriver) { - lnshStationDeviceDriver = (LnshStationDeviceDriver) addressdevice.getDeviceDriver(); - //请求取货 - if ("Load".equals(action)) { - if (lnshStationDeviceDriver.getMode() == 2 && lnshStationDeviceDriver.getMove() > 0) { - inst.setExecute_status("1"); - lnshStationDeviceDriver.setFlag(1); - is_feedback = true; - } - //请求放货 - } else if ("Unload".equals(action)) { - if (lnshStationDeviceDriver.getMode() == 2 && lnshStationDeviceDriver.getMove() == 0) { - inst.setExecute_status("3"); - lnshStationDeviceDriver.setFlag(3); - is_feedback = true; - } - } else if ("NOP".equals(action)) { - //调用LMS接口 - if(StrUtil.isNotEmpty(lnshStationDeviceDriver.getBarcode())){ - JSONObject json = new JSONObject(); - json.put("device_code",address); - json.put("type","5"); - json.put("vehicle_code",lnshStationDeviceDriver.getBarcode()); - HttpResponse result = acsToWmsService.inKiln(json); - if (ObjectUtil.isNotEmpty(result)) { - JSONObject jsonObject = JSONObject.parseObject(result.body()); - if (result.getStatus() == 200 && StrUtil.equals(jsonObject.get("status").toString(),"200")) { - inst.setExecute_status("3"); - is_feedback = true; - } - } - } - } - } if (addressdevice.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) addressdevice.getDeviceDriver(); //请求取货 @@ -523,27 +486,7 @@ public class MagicAgvServiceImpl implements MagicAgvService { } } } - //晟华工位模板 - if (addressdevice.getDeviceDriver() instanceof LnshStationDeviceDriver) { - lnshStationDeviceDriver = (LnshStationDeviceDriver) addressdevice.getDeviceDriver(); - //取货完成 - if ("Load".equals(action)) { - if (lnshStationDeviceDriver.getMode() == 2 && lnshStationDeviceDriver.getMove() == 0) { - inst.setExecute_device_code(processingVehicle); - inst.setExecute_status("2"); - lnshStationDeviceDriver.setFlag(2); - is_feedback = true; - } - //放货完成 - } else if ("Unload".equals(action)) { - if (lnshStationDeviceDriver.getMode() == 2 && lnshStationDeviceDriver.getMove() > 0) { - inst.setExecute_device_code(address); - inst.setExecute_status("4"); - lnshStationDeviceDriver.setFlag(4); - is_feedback = true; - } - } - } + if (addressdevice.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) addressdevice.getDeviceDriver(); //取货完成 @@ -635,7 +578,6 @@ public class MagicAgvServiceImpl implements MagicAgvService { StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver; StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver; StandardStorageDeviceDriver standardStorageDeviceDriver; - LnshStationDeviceDriver lnshStationDeviceDriver; //mes = AgvClientXZ.mes(zlbh, device, type); //暂定 0就绪 1请求取货 2取货完成 3请求放货 4放货完成 5取货完成离开 6放货完成离开 7请求进入区域 8请求离开区域 @@ -663,26 +605,6 @@ public class MagicAgvServiceImpl implements MagicAgvService { } } - if (addressdevice.getDeviceDriver() instanceof LnshStationDeviceDriver) { - lnshStationDeviceDriver = (LnshStationDeviceDriver) addressdevice.getDeviceDriver(); - flag = true; - log.info("agvstatus:" + lnshStationDeviceDriver.getFlag() + ""); - //取货完成离开 - if (lnshStationDeviceDriver.getFlag() == 2) { - if (lnshStationDeviceDriver.getMove() == 0) { - flag = true; - lnshStationDeviceDriver.setFlag(5); - } - } - //放货完成离开 - if (lnshStationDeviceDriver.getFlag() == 4) { - if (lnshStationDeviceDriver.getMove() == 1) { - flag = true; - lnshStationDeviceDriver.setFlag(6); - } - } - } - if (addressdevice.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) addressdevice.getDeviceDriver(); flag = true; diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index e4bb4d5..014e5ac 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -9,18 +9,6 @@ import lombok.extern.slf4j.Slf4j; 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_driver.lnsh.lnsh_Laminating_machine.LnshLaminatingMachineDeviceDriver; -import org.nl.acs.device_driver.lnsh.lnsh_kiln_lane.LnshKilnLaneDeviceDriver; -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_package_pallet_manipulator.LnshPackagePalletManipulatorDeviceDriver; -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.standard_autodoor.StandardAutodoorDeviceDriver; import org.nl.acs.device_driver.standard_conveyor_monitor.StandardCoveyorMonitorDeviceDriver; import org.nl.acs.device_driver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; @@ -284,48 +272,6 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { throw new Exception("未找到对应设备:" + device_code); } - LnshMixingMillDeviceDriver lnshMixingMillDeviceDriver; - LnshPressDeviceDriver lnshPressDeviceDriver; - LnshPackagePalletManipulatorDeviceDriver lnshPackagePalletManipulatorDeviceDriver; - 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 LnshPackagePalletManipulatorDeviceDriver) { - lnshPackagePalletManipulatorDeviceDriver = (LnshPackagePalletManipulatorDeviceDriver) device.getDeviceDriver(); - if (StrUtil.isEmpty(qty)) { - throw new WDKException("数量不能为空"); - } - if (StrUtil.isEmpty(material_code)) { - throw new WDKException("物料编号不能为空！"); - } - lnshPackagePalletManipulatorDeviceDriver.writing("to_order_No",producetask_code); - lnshPackagePalletManipulatorDeviceDriver.writing("to_material_qty",qty); - lnshPackagePalletManipulatorDeviceDriver.writing("to_material_code",material_code); - is_flag = true; - } //下发成功后，写入工单信息表记录 ProduceshiftorderDto dto = new ProduceshiftorderDto(); @@ -417,16 +363,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { if (ObjectUtil.isEmpty(device)) { throw new Exception("未找到对应设备:" + device_code); } - LnshLaminatingMachineDeviceDriver lnshLaminatingMachineDeviceDriver; - //晟华覆膜机 - if (device.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) { - lnshLaminatingMachineDeviceDriver = (LnshLaminatingMachineDeviceDriver) device.getDeviceDriver(); - org.nl.acs.device_driver.lnsh.lnsh_Laminating_machine.ItemProtocol itemProtocol = new org.nl.acs.device_driver.lnsh.lnsh_Laminating_machine.ItemProtocol(lnshLaminatingMachineDeviceDriver); - if (!lnshLaminatingMachineDeviceDriver.isExistFieldName(code, itemProtocol)) { - throw new Exception("设备:" + device_code + "未找到对应信号:" + code); - } - lnshLaminatingMachineDeviceDriver.writing(code, value); - } + } JSONObject resultJson = new JSONObject(); resultJson.put("status", HttpStatus.OK); @@ -455,26 +392,6 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { StandardScannerDeviceDriver standardScannerDeviceDriver; //自动门 StandardAutodoorDeviceDriver standardAutodoorDeviceDriver; - //嘉耐-码垛机械手 - LnshPalletizingManipulatorDeviceDriver lnshPalletizingManipulatorDeviceDriver; - //嘉耐-窑车道 - LnshKilnLaneDeviceDriver lnshKilnLaneDeviceDriver; - //嘉耐-包装码垛机械手 - LnshPackagePalletManipulatorDeviceDriver lnshPackagePalletManipulatorDeviceDriver; - //晟华-贴标机 - LnshLabelingMachineDeviceDriver lnshLabelingMachineDeviceDriver; - //嘉耐-拆垛机械手 - LnshSplitManipulatorDeviceDriver lnshSplitManipulatorDeviceDriver; - //嘉耐-RGV - LnshRGVDeviceDriver lnshRGVDeviceDriver; - //嘉耐-工位(交互模板) - LnshStationDeviceDriver lnshStationDeviceDriver; - //嘉耐-缓存货架 - LnshLaminatingMachineDeviceDriver lnshLaminatingMachineDeviceDriver; - //嘉耐-包装码拆垛机械手 - RljnPackagePalletSplitManipulatorDeviceDriver rljnPackagePalletSplitManipulatorDeviceDriver; - //嘉耐-码垛机械手工位 - LnshPalletizingManipulatorSiteDeviceDriver lnshPalletizingManipulatorSiteDeviceDriver; if (datas.size() == 0) { List list = DeviceService.findCacheDevice(); @@ -486,196 +403,6 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { if (ObjectUtil.isNull(device)) { continue; } - if (device.getDeviceDriver() instanceof LnshStationDeviceDriver) { - lnshStationDeviceDriver = (LnshStationDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshStationDeviceDriver.getMode()); - jo.put("move", lnshStationDeviceDriver.getMove()); - jo.put("action", lnshStationDeviceDriver.getAction()); - jo.put("io_action", lnshStationDeviceDriver.getIo_action()); - jo.put("hasGoods", lnshStationDeviceDriver.getHasGoods()); - jo.put("isOnline", lnshStationDeviceDriver.getIsonline()); - jo.put("error", lnshStationDeviceDriver.getError()); - jo.put("isError", lnshStationDeviceDriver.getIserror()); - jo.put("message", lnshStationDeviceDriver.getMessage()); - jo.put("task", lnshStationDeviceDriver.getTask()); - jo.put("weight", lnshStationDeviceDriver.getWeight()); - jo.put("material", lnshStationDeviceDriver.getMaterial()); - jo.put("barcode", lnshStationDeviceDriver.getBarcode()); -// jo.put("specifications", lnshStationDeviceDriver.getSpecifications()); -// jo.put("batch", lnshStationDeviceDriver.getBatch()); -// jo.put("pallet_type", lnshStationDeviceDriver.getContainer_type()); - - } else if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) { - lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshPalletizingManipulatorSiteDeviceDriver.getMode()); - jo.put("move", lnshPalletizingManipulatorSiteDeviceDriver.getMove()); - jo.put("action", lnshPalletizingManipulatorSiteDeviceDriver.getAction()); - jo.put("io_action", lnshPalletizingManipulatorSiteDeviceDriver.getIo_action()); - jo.put("hasGoods", lnshPalletizingManipulatorSiteDeviceDriver.getHasGoods()); - jo.put("isOnline", lnshPalletizingManipulatorSiteDeviceDriver.getIsonline()); - jo.put("error", lnshPalletizingManipulatorSiteDeviceDriver.getError()); - jo.put("isError", lnshPalletizingManipulatorSiteDeviceDriver.getIserror()); - jo.put("message", lnshPalletizingManipulatorSiteDeviceDriver.getMessage()); - jo.put("task", lnshPalletizingManipulatorSiteDeviceDriver.getTask()); - jo.put("weight", lnshPalletizingManipulatorSiteDeviceDriver.getWeight()); - jo.put("material", lnshPalletizingManipulatorSiteDeviceDriver.getMaterial()); - jo.put("barcode", lnshPalletizingManipulatorSiteDeviceDriver.getBarcode()); - jo.put("specifications", lnshPalletizingManipulatorSiteDeviceDriver.getSpecifications()); - jo.put("AlongSide", lnshPalletizingManipulatorSiteDeviceDriver.getAlongSide()); - jo.put("BshortSide", lnshPalletizingManipulatorSiteDeviceDriver.getBshortSide()); - jo.put("Htrapezoidal", lnshPalletizingManipulatorSiteDeviceDriver.getHtrapezoidal()); - jo.put("Wthickness", lnshPalletizingManipulatorSiteDeviceDriver.getWthickness()); - jo.put("batch", lnshPalletizingManipulatorSiteDeviceDriver.getBatch()); - } else if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorDeviceDriver) { - lnshPalletizingManipulatorDeviceDriver = (LnshPalletizingManipulatorDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshPalletizingManipulatorDeviceDriver.getMode()); - jo.put("status", lnshPalletizingManipulatorDeviceDriver.getStatus()); - jo.put("action", lnshPalletizingManipulatorDeviceDriver.getAction()); - jo.put("isOnline", lnshPalletizingManipulatorDeviceDriver.getIsonline()); - jo.put("error", lnshPalletizingManipulatorDeviceDriver.getError()); - jo.put("put_station", lnshPalletizingManipulatorDeviceDriver.getPut_station()); - jo.put("material", lnshPalletizingManipulatorDeviceDriver.getMaterial()); - jo.put("encoder_qty", lnshPalletizingManipulatorDeviceDriver.getEncoder_qty()); -// jo.put("batch", lnshPalletizingManipulatorDeviceDriver.getBatch()); -// jo.put("specifications", lnshPalletizingManipulatorDeviceDriver.getSpecifications()); - jo.put("isError", lnshPalletizingManipulatorDeviceDriver.getIserror()); - jo.put("message", lnshPalletizingManipulatorDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshKilnLaneDeviceDriver) { - lnshKilnLaneDeviceDriver = (LnshKilnLaneDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshKilnLaneDeviceDriver.getMode()); - jo.put("status", lnshKilnLaneDeviceDriver.getStatus()); - jo.put("isOnline", lnshKilnLaneDeviceDriver.getIsonline()); - jo.put("error", lnshKilnLaneDeviceDriver.getError()); - jo.put("isError", lnshKilnLaneDeviceDriver.getIserror()); - jo.put("open_time", lnshKilnLaneDeviceDriver.getOpen_time()); - jo.put("standby_time", lnshKilnLaneDeviceDriver.getStandby_time()); - jo.put("production_time", lnshKilnLaneDeviceDriver.getProduction_time()); - jo.put("error_time", lnshKilnLaneDeviceDriver.getError_time()); - jo.put("car_sum", lnshKilnLaneDeviceDriver.getCar_sum()); - 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 LnshPackagePalletManipulatorDeviceDriver) { - lnshPackagePalletManipulatorDeviceDriver = (LnshPackagePalletManipulatorDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshPackagePalletManipulatorDeviceDriver.getMode()); - jo.put("status", lnshPackagePalletManipulatorDeviceDriver.getStatus()); -// jo.put("onoff_status", lnshPackagePalletManipulatorDeviceDriver.getOnoff_status()); -// jo.put("specifications", lnshPackagePalletManipulatorDeviceDriver.getSpecifications()); -// jo.put("batch", lnshPackagePalletManipulatorDeviceDriver.getBatch()); - jo.put("isOnline", lnshPackagePalletManipulatorDeviceDriver.getIsonline()); - jo.put("error", lnshPackagePalletManipulatorDeviceDriver.getError()); - jo.put("putStation", lnshPackagePalletManipulatorDeviceDriver.getPut_station()); - jo.put("barcode", lnshPackagePalletManipulatorDeviceDriver.getBarcode()); - jo.put("material", lnshPackagePalletManipulatorDeviceDriver.getMaterial()); - jo.put("qty", lnshPackagePalletManipulatorDeviceDriver.getQty()); - jo.put("open_time", lnshPackagePalletManipulatorDeviceDriver.getOpen_time()); - jo.put("standby_time", lnshPackagePalletManipulatorDeviceDriver.getStandby_time()); - jo.put("production_time", lnshPackagePalletManipulatorDeviceDriver.getProduction_time()); - jo.put("error_time", lnshPackagePalletManipulatorDeviceDriver.getError_time()); - jo.put("order_No", lnshPackagePalletManipulatorDeviceDriver.getOrder_No()); - jo.put("isError", lnshPackagePalletManipulatorDeviceDriver.getIserror()); - jo.put("message", lnshPackagePalletManipulatorDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof RljnPackagePalletSplitManipulatorDeviceDriver) { - rljnPackagePalletSplitManipulatorDeviceDriver = (RljnPackagePalletSplitManipulatorDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", rljnPackagePalletSplitManipulatorDeviceDriver.getMode()); - jo.put("status", rljnPackagePalletSplitManipulatorDeviceDriver.getStatus()); - jo.put("isOnline", rljnPackagePalletSplitManipulatorDeviceDriver.getIsonline()); - jo.put("error", rljnPackagePalletSplitManipulatorDeviceDriver.getError()); - jo.put("putStation", rljnPackagePalletSplitManipulatorDeviceDriver.getPut_station()); - jo.put("barcode", rljnPackagePalletSplitManipulatorDeviceDriver.getBarcode()); - jo.put("material", rljnPackagePalletSplitManipulatorDeviceDriver.getMaterial()); - jo.put("qty", rljnPackagePalletSplitManipulatorDeviceDriver.getQty()); - jo.put("open_time", rljnPackagePalletSplitManipulatorDeviceDriver.getOpen_time()); - jo.put("standby_time", rljnPackagePalletSplitManipulatorDeviceDriver.getStandby_time()); - jo.put("production_time", rljnPackagePalletSplitManipulatorDeviceDriver.getProduction_time()); - jo.put("error_time", rljnPackagePalletSplitManipulatorDeviceDriver.getError_time()); - jo.put("order_No", rljnPackagePalletSplitManipulatorDeviceDriver.getOrder_No()); - jo.put("onoff_status", rljnPackagePalletSplitManipulatorDeviceDriver.getOnoff_status()); - jo.put("getStation", rljnPackagePalletSplitManipulatorDeviceDriver.getGetStation()); - jo.put("specifications", rljnPackagePalletSplitManipulatorDeviceDriver.getSpecifications()); - jo.put("batch", rljnPackagePalletSplitManipulatorDeviceDriver.getBatch()); - jo.put("total_split", rljnPackagePalletSplitManipulatorDeviceDriver.getTotal_split()); - jo.put("isError", rljnPackagePalletSplitManipulatorDeviceDriver.getIserror()); - jo.put("message", rljnPackagePalletSplitManipulatorDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshLabelingMachineDeviceDriver) { - lnshLabelingMachineDeviceDriver = (LnshLabelingMachineDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshLabelingMachineDeviceDriver.getMode()); - jo.put("status", lnshLabelingMachineDeviceDriver.getStatus()); - jo.put("isOnline", lnshLabelingMachineDeviceDriver.getIsonline()); - jo.put("open_time", lnshLabelingMachineDeviceDriver.getOpen_time()); - jo.put("close_time", lnshLabelingMachineDeviceDriver.getClose_time()); - jo.put("standby_time", lnshLabelingMachineDeviceDriver.getStandby_time()); - jo.put("production_time", lnshLabelingMachineDeviceDriver.getProduction_time()); - jo.put("error_time", lnshLabelingMachineDeviceDriver.getError_time()); - jo.put("labeling_qty", lnshLabelingMachineDeviceDriver.getLabeling_qty()); - jo.put("isError", lnshLabelingMachineDeviceDriver.getIserror()); - jo.put("message", lnshLabelingMachineDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshSplitManipulatorDeviceDriver) { - lnshSplitManipulatorDeviceDriver = (LnshSplitManipulatorDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshSplitManipulatorDeviceDriver.getMode()); - jo.put("isOnline", lnshSplitManipulatorDeviceDriver.getIsonline()); - jo.put("error", lnshSplitManipulatorDeviceDriver.getError()); - jo.put("getStation", lnshSplitManipulatorDeviceDriver.getGetStation()); - jo.put("barcode", lnshSplitManipulatorDeviceDriver.getBarcode()); - jo.put("material", lnshSplitManipulatorDeviceDriver.getMaterial()); -// jo.put("batch", lnshSplitManipulatorDeviceDriver.getBatch()); -// jo.put("specifications", lnshSplitManipulatorDeviceDriver.getSpecifications()); -// jo.put("qty", lnshSplitManipulatorDeviceDriver.getQty()); - jo.put("total_split", lnshSplitManipulatorDeviceDriver.getTotal_split()); - jo.put("open_time", lnshSplitManipulatorDeviceDriver.getOpen_time()); - jo.put("standby_time", lnshSplitManipulatorDeviceDriver.getStandby_time()); - jo.put("production_time", lnshSplitManipulatorDeviceDriver.getProduction_time()); - jo.put("error_time", lnshSplitManipulatorDeviceDriver.getError_time()); - jo.put("isError", lnshSplitManipulatorDeviceDriver.getIserror()); - jo.put("message", lnshSplitManipulatorDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) { - lnshLaminatingMachineDeviceDriver = (LnshLaminatingMachineDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshLaminatingMachineDeviceDriver.getMode()); - jo.put("move", lnshLaminatingMachineDeviceDriver.getMove()); - jo.put("container_type", lnshLaminatingMachineDeviceDriver.getContainer_type()); -// jo.put("barcode", lnshLaminatingMachineDeviceDriver.getBarcode()); - jo.put("task", lnshLaminatingMachineDeviceDriver.getTask()); - jo.put("error", lnshLaminatingMachineDeviceDriver.getError()); - jo.put("isOnline", lnshLaminatingMachineDeviceDriver.getIsonline()); - jo.put("isError", lnshLaminatingMachineDeviceDriver.getIserror()); - jo.put("message", lnshLaminatingMachineDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshRGVDeviceDriver) { - lnshRGVDeviceDriver = (LnshRGVDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshRGVDeviceDriver.getMode()); - jo.put("status", lnshRGVDeviceDriver.getStatus()); - jo.put("move_1", lnshRGVDeviceDriver.getMove_1()); - jo.put("move_2", lnshRGVDeviceDriver.getMove_2()); - jo.put("action_1", lnshRGVDeviceDriver.getAction_1()); - jo.put("action_2", lnshRGVDeviceDriver.getAction_2()); - jo.put("walk_y", lnshRGVDeviceDriver.getWalk_y()); - jo.put("error", lnshRGVDeviceDriver.getError()); - jo.put("task1", lnshRGVDeviceDriver.getTask1()); - jo.put("task2", lnshRGVDeviceDriver.getTask2()); - jo.put("isOnline", lnshRGVDeviceDriver.getIsonline()); - jo.put("isError", lnshRGVDeviceDriver.getIserror()); - jo.put("message", lnshRGVDeviceDriver.getMessage()); - jo.put("open_time", lnshRGVDeviceDriver.getOpen_time()); - jo.put("standby_time", lnshRGVDeviceDriver.getStandby_time()); - jo.put("production_time", lnshRGVDeviceDriver.getProduction_time()); - jo.put("error_time", lnshRGVDeviceDriver.getError_time()); -// jo.put("task_qty", lnshRGVDeviceDriver.getTask_qty()); -// jo.put("finishTask_qty", lnshRGVDeviceDriver.getFinishTask_qty()); -// jo.put("batch", lnshRGVDeviceDriver.getBatch()); -// jo.put("specifications", lnshRGVDeviceDriver.getSpecifications()); -// jo.put("qty", lnshRGVDeviceDriver.getQty()); - } else { - jo.put("device_code", device.getDevice_code()); - } backja.add(jo); } } else { @@ -734,195 +461,6 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("ip", standardScannerDeviceDriver.getIp()); jo.put("container", StrUtil.isEmpty(standardScannerDeviceDriver.readBarcode()) ? "" : standardScannerDeviceDriver.readBarcode()); - } else if (device.getDeviceDriver() instanceof LnshStationDeviceDriver) { - lnshStationDeviceDriver = (LnshStationDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshStationDeviceDriver.getMode()); - jo.put("move", lnshStationDeviceDriver.getMove()); - jo.put("action", lnshStationDeviceDriver.getAction()); - jo.put("io_action", lnshStationDeviceDriver.getIo_action()); - jo.put("hasGoods", lnshStationDeviceDriver.getHasGoods()); - jo.put("isOnline", lnshStationDeviceDriver.getIsonline()); - jo.put("error", lnshStationDeviceDriver.getError()); - jo.put("isError", lnshStationDeviceDriver.getIserror()); - jo.put("message", lnshStationDeviceDriver.getMessage()); - jo.put("task", lnshStationDeviceDriver.getTask()); - jo.put("weight", lnshStationDeviceDriver.getWeight()); - jo.put("material", lnshStationDeviceDriver.getMaterial()); - jo.put("barcode", lnshStationDeviceDriver.getBarcode()); -// jo.put("specifications", lnshStationDeviceDriver.getSpecifications()); -// jo.put("batch", lnshStationDeviceDriver.getBatch()); -// jo.put("pallet_type", lnshStationDeviceDriver.getContainer_type()); - - } else if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) { - lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshPalletizingManipulatorSiteDeviceDriver.getMode()); - jo.put("move", lnshPalletizingManipulatorSiteDeviceDriver.getMove()); - jo.put("action", lnshPalletizingManipulatorSiteDeviceDriver.getAction()); - jo.put("io_action", lnshPalletizingManipulatorSiteDeviceDriver.getIo_action()); - jo.put("hasGoods", lnshPalletizingManipulatorSiteDeviceDriver.getHasGoods()); - jo.put("isOnline", lnshPalletizingManipulatorSiteDeviceDriver.getIsonline()); - jo.put("error", lnshPalletizingManipulatorSiteDeviceDriver.getError()); - jo.put("isError", lnshPalletizingManipulatorSiteDeviceDriver.getIserror()); - jo.put("message", lnshPalletizingManipulatorSiteDeviceDriver.getMessage()); - jo.put("task", lnshPalletizingManipulatorSiteDeviceDriver.getTask()); - jo.put("weight", lnshPalletizingManipulatorSiteDeviceDriver.getWeight()); - jo.put("material", lnshPalletizingManipulatorSiteDeviceDriver.getMaterial()); - jo.put("barcode", lnshPalletizingManipulatorSiteDeviceDriver.getBarcode()); - jo.put("specifications", lnshPalletizingManipulatorSiteDeviceDriver.getSpecifications()); - jo.put("AlongSide", lnshPalletizingManipulatorSiteDeviceDriver.getAlongSide()); - jo.put("BshortSide", lnshPalletizingManipulatorSiteDeviceDriver.getBshortSide()); - jo.put("Htrapezoidal", lnshPalletizingManipulatorSiteDeviceDriver.getHtrapezoidal()); - jo.put("Wthickness", lnshPalletizingManipulatorSiteDeviceDriver.getWthickness()); - jo.put("batch", lnshPalletizingManipulatorSiteDeviceDriver.getBatch()); - } else if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorDeviceDriver) { - lnshPalletizingManipulatorDeviceDriver = (LnshPalletizingManipulatorDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshPalletizingManipulatorDeviceDriver.getMode()); - jo.put("status", lnshPalletizingManipulatorDeviceDriver.getStatus()); - jo.put("action", lnshPalletizingManipulatorDeviceDriver.getAction()); - jo.put("isOnline", lnshPalletizingManipulatorDeviceDriver.getIsonline()); - jo.put("error", lnshPalletizingManipulatorDeviceDriver.getError()); - jo.put("put_station", lnshPalletizingManipulatorDeviceDriver.getPut_station()); - jo.put("material", lnshPalletizingManipulatorDeviceDriver.getMaterial()); - jo.put("encoder_qty", lnshPalletizingManipulatorDeviceDriver.getEncoder_qty()); -// jo.put("batch", lnshPalletizingManipulatorDeviceDriver.getBatch()); -// jo.put("specifications", lnshPalletizingManipulatorDeviceDriver.getSpecifications()); - jo.put("isError", lnshPalletizingManipulatorDeviceDriver.getIserror()); - jo.put("message", lnshPalletizingManipulatorDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshKilnLaneDeviceDriver) { - lnshKilnLaneDeviceDriver = (LnshKilnLaneDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshKilnLaneDeviceDriver.getMode()); - jo.put("status", lnshKilnLaneDeviceDriver.getStatus()); - jo.put("isOnline", lnshKilnLaneDeviceDriver.getIsonline()); - jo.put("error", lnshKilnLaneDeviceDriver.getError()); - jo.put("isError", lnshKilnLaneDeviceDriver.getIserror()); - jo.put("open_time", lnshKilnLaneDeviceDriver.getOpen_time()); - jo.put("standby_time", lnshKilnLaneDeviceDriver.getStandby_time()); - jo.put("production_time", lnshKilnLaneDeviceDriver.getProduction_time()); - jo.put("error_time", lnshKilnLaneDeviceDriver.getError_time()); - jo.put("car_sum", lnshKilnLaneDeviceDriver.getCar_sum()); - 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 LnshPackagePalletManipulatorDeviceDriver) { - lnshPackagePalletManipulatorDeviceDriver = (LnshPackagePalletManipulatorDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshPackagePalletManipulatorDeviceDriver.getMode()); - jo.put("status", lnshPackagePalletManipulatorDeviceDriver.getStatus()); -// jo.put("onoff_status", lnshPackagePalletManipulatorDeviceDriver.getOnoff_status()); -// jo.put("specifications", lnshPackagePalletManipulatorDeviceDriver.getSpecifications()); -// jo.put("batch", lnshPackagePalletManipulatorDeviceDriver.getBatch()); - jo.put("isOnline", lnshPackagePalletManipulatorDeviceDriver.getIsonline()); - jo.put("error", lnshPackagePalletManipulatorDeviceDriver.getError()); - jo.put("putStation", lnshPackagePalletManipulatorDeviceDriver.getPut_station()); - jo.put("barcode", lnshPackagePalletManipulatorDeviceDriver.getBarcode()); - jo.put("material", lnshPackagePalletManipulatorDeviceDriver.getMaterial()); - jo.put("qty", lnshPackagePalletManipulatorDeviceDriver.getQty()); - jo.put("open_time", lnshPackagePalletManipulatorDeviceDriver.getOpen_time()); - jo.put("standby_time", lnshPackagePalletManipulatorDeviceDriver.getStandby_time()); - jo.put("production_time", lnshPackagePalletManipulatorDeviceDriver.getProduction_time()); - jo.put("error_time", lnshPackagePalletManipulatorDeviceDriver.getError_time()); - jo.put("order_No", lnshPackagePalletManipulatorDeviceDriver.getOrder_No()); - jo.put("isError", lnshPackagePalletManipulatorDeviceDriver.getIserror()); - jo.put("message", lnshPackagePalletManipulatorDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof RljnPackagePalletSplitManipulatorDeviceDriver) { - rljnPackagePalletSplitManipulatorDeviceDriver = (RljnPackagePalletSplitManipulatorDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", rljnPackagePalletSplitManipulatorDeviceDriver.getMode()); - jo.put("status", rljnPackagePalletSplitManipulatorDeviceDriver.getStatus()); - jo.put("isOnline", rljnPackagePalletSplitManipulatorDeviceDriver.getIsonline()); - jo.put("error", rljnPackagePalletSplitManipulatorDeviceDriver.getError()); - jo.put("putStation", rljnPackagePalletSplitManipulatorDeviceDriver.getPut_station()); - jo.put("barcode", rljnPackagePalletSplitManipulatorDeviceDriver.getBarcode()); - jo.put("material", rljnPackagePalletSplitManipulatorDeviceDriver.getMaterial()); - jo.put("qty", rljnPackagePalletSplitManipulatorDeviceDriver.getQty()); - jo.put("open_time", rljnPackagePalletSplitManipulatorDeviceDriver.getOpen_time()); - jo.put("standby_time", rljnPackagePalletSplitManipulatorDeviceDriver.getStandby_time()); - jo.put("production_time", rljnPackagePalletSplitManipulatorDeviceDriver.getProduction_time()); - jo.put("error_time", rljnPackagePalletSplitManipulatorDeviceDriver.getError_time()); - jo.put("order_No", rljnPackagePalletSplitManipulatorDeviceDriver.getOrder_No()); - jo.put("onoff_status", rljnPackagePalletSplitManipulatorDeviceDriver.getOnoff_status()); - jo.put("getStation", rljnPackagePalletSplitManipulatorDeviceDriver.getGetStation()); - jo.put("specifications", rljnPackagePalletSplitManipulatorDeviceDriver.getSpecifications()); - jo.put("batch", rljnPackagePalletSplitManipulatorDeviceDriver.getBatch()); - jo.put("total_split", rljnPackagePalletSplitManipulatorDeviceDriver.getTotal_split()); - jo.put("isError", rljnPackagePalletSplitManipulatorDeviceDriver.getIserror()); - jo.put("message", rljnPackagePalletSplitManipulatorDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshLabelingMachineDeviceDriver) { - lnshLabelingMachineDeviceDriver = (LnshLabelingMachineDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshLabelingMachineDeviceDriver.getMode()); - jo.put("status", lnshLabelingMachineDeviceDriver.getStatus()); - jo.put("isOnline", lnshLabelingMachineDeviceDriver.getIsonline()); - jo.put("open_time", lnshLabelingMachineDeviceDriver.getOpen_time()); - jo.put("close_time", lnshLabelingMachineDeviceDriver.getClose_time()); - jo.put("standby_time", lnshLabelingMachineDeviceDriver.getStandby_time()); - jo.put("production_time", lnshLabelingMachineDeviceDriver.getProduction_time()); - jo.put("error_time", lnshLabelingMachineDeviceDriver.getError_time()); - jo.put("labeling_qty", lnshLabelingMachineDeviceDriver.getLabeling_qty()); - jo.put("isError", lnshLabelingMachineDeviceDriver.getIserror()); - jo.put("message", lnshLabelingMachineDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshSplitManipulatorDeviceDriver) { - lnshSplitManipulatorDeviceDriver = (LnshSplitManipulatorDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshSplitManipulatorDeviceDriver.getMode()); - jo.put("isOnline", lnshSplitManipulatorDeviceDriver.getIsonline()); - jo.put("error", lnshSplitManipulatorDeviceDriver.getError()); - jo.put("getStation", lnshSplitManipulatorDeviceDriver.getGetStation()); - jo.put("barcode", lnshSplitManipulatorDeviceDriver.getBarcode()); - jo.put("material", lnshSplitManipulatorDeviceDriver.getMaterial()); -// jo.put("batch", lnshSplitManipulatorDeviceDriver.getBatch()); -// jo.put("specifications", lnshSplitManipulatorDeviceDriver.getSpecifications()); -// jo.put("qty", lnshSplitManipulatorDeviceDriver.getQty()); - jo.put("total_split", lnshSplitManipulatorDeviceDriver.getTotal_split()); - jo.put("open_time", lnshSplitManipulatorDeviceDriver.getOpen_time()); - jo.put("standby_time", lnshSplitManipulatorDeviceDriver.getStandby_time()); - jo.put("production_time", lnshSplitManipulatorDeviceDriver.getProduction_time()); - jo.put("error_time", lnshSplitManipulatorDeviceDriver.getError_time()); - jo.put("isError", lnshSplitManipulatorDeviceDriver.getIserror()); - jo.put("message", lnshSplitManipulatorDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) { - lnshLaminatingMachineDeviceDriver = (LnshLaminatingMachineDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshLaminatingMachineDeviceDriver.getMode()); - jo.put("move", lnshLaminatingMachineDeviceDriver.getMove()); - jo.put("container_type", lnshLaminatingMachineDeviceDriver.getContainer_type()); -// jo.put("barcode", lnshLaminatingMachineDeviceDriver.getBarcode()); - jo.put("task", lnshLaminatingMachineDeviceDriver.getTask()); - jo.put("error", lnshLaminatingMachineDeviceDriver.getError()); - jo.put("isOnline", lnshLaminatingMachineDeviceDriver.getIsonline()); - jo.put("isError", lnshLaminatingMachineDeviceDriver.getIserror()); - jo.put("message", lnshLaminatingMachineDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshRGVDeviceDriver) { - lnshRGVDeviceDriver = (LnshRGVDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", lnshRGVDeviceDriver.getMode()); - jo.put("status", lnshRGVDeviceDriver.getStatus()); - jo.put("move_1", lnshRGVDeviceDriver.getMove_1()); - jo.put("move_2", lnshRGVDeviceDriver.getMove_2()); - jo.put("action_1", lnshRGVDeviceDriver.getAction_1()); - jo.put("action_2", lnshRGVDeviceDriver.getAction_2()); - jo.put("walk_y", lnshRGVDeviceDriver.getWalk_y()); - jo.put("error", lnshRGVDeviceDriver.getError()); - jo.put("task1", lnshRGVDeviceDriver.getTask1()); - jo.put("task2", lnshRGVDeviceDriver.getTask2()); - jo.put("isOnline", lnshRGVDeviceDriver.getIsonline()); - jo.put("isError", lnshRGVDeviceDriver.getIserror()); - jo.put("message", lnshRGVDeviceDriver.getMessage()); - jo.put("open_time", lnshRGVDeviceDriver.getOpen_time()); - jo.put("standby_time", lnshRGVDeviceDriver.getStandby_time()); - jo.put("production_time", lnshRGVDeviceDriver.getProduction_time()); - jo.put("error_time", lnshRGVDeviceDriver.getError_time()); -// jo.put("task_qty", lnshRGVDeviceDriver.getTask_qty()); -// jo.put("finishTask_qty", lnshRGVDeviceDriver.getFinishTask_qty()); -// jo.put("batch", lnshRGVDeviceDriver.getBatch()); -// jo.put("specifications", lnshRGVDeviceDriver.getSpecifications()); -// jo.put("qty", lnshRGVDeviceDriver.getQty()); - } else { - jo.put("device_code", device.getDevice_code()); } backja.add(jo); } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index e425a09..4dab6b7 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -20,7 +20,6 @@ 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.lamp_three_color.LampThreecolorDeviceDriver; -import org.nl.acs.device_driver.lnsh.lnsh_station.LnshStationDeviceDriver; import org.nl.acs.device_driver.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver; import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver; import org.nl.acs.instruction.service.InstructionService; @@ -645,12 +644,6 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu LampThreecolorDeviceDriver lampThreecolorDeviceDriver; - LnshStationDeviceDriver lnshStationDeviceDriver; - if (device.getDeviceDriver() instanceof LnshStationDeviceDriver) { - lnshStationDeviceDriver = (LnshStationDeviceDriver) device.getDeviceDriver(); - lnshStationDeviceDriver.writing(3, Integer.parseInt(dto.getInstruction_code())); - } - //变更三色灯状态 if (!ObjectUtils.isEmpty(device.getExtraValue().get("link_three_lamp"))) { String lamd_device = device.getExtraValue().get("link_three_lamp").toString(); diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/logicflow/service/impl/StageServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/logicflow/service/impl/StageServiceImpl.java index 23e1ba6..68e2e95 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/logicflow/service/impl/StageServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/logicflow/service/impl/StageServiceImpl.java @@ -8,17 +8,6 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device_driver.lnsh.lnsh_Laminating_machine.LnshLaminatingMachineDeviceDriver; -import org.nl.acs.device_driver.lnsh.lnsh_kiln_lane.LnshKilnLaneDeviceDriver; -import org.nl.acs.device_driver.lnsh.lnsh_labeling_machine.LnshLabelingMachineDeviceDriver; -import org.nl.acs.device_driver.lnsh.lnsh_one_rgv.LnshOneRGVDeviceDriver; -import org.nl.acs.device_driver.lnsh.lnsh_package_pallet_manipulator.LnshPackagePalletManipulatorDeviceDriver; -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_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.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; @@ -227,28 +216,7 @@ public class StageServiceImpl implements StageService { //中刚洛耐RGV StandardRGVDeviceDriver standardRGVDeviceDriver; //电子围栏viceDriver electricFenceDeviceDriver; - //嘉耐-码垛机械手 - LnshPalletizingManipulatorDeviceDriver lnshPalletizingManipulatorDeviceDriver; - //嘉耐-窑车道 - LnshKilnLaneDeviceDriver lnshKilnLaneDeviceDriver; - //嘉耐-包装码垛机械手 - LnshPackagePalletManipulatorDeviceDriver lnshPackagePalletManipulatorDeviceDriver; - //晟华-贴标机 - LnshLabelingMachineDeviceDriver lnshLabelingMachineDeviceDriver; - //嘉耐-拆垛机械手 - LnshSplitManipulatorDeviceDriver lnshSplitManipulatorDeviceDriver; - //嘉耐双工位RGV - LnshRGVDeviceDriver lnshRGVDeviceDriver; - //嘉耐单工位RGV - LnshOneRGVDeviceDriver lnshOneRGVDeviceDriver; - //嘉耐-工位(交互模板) - LnshStationDeviceDriver lnshStationDeviceDriver; - //嘉耐-缓存货架 - LnshLaminatingMachineDeviceDriver lnshLaminatingMachineDeviceDriver; - //嘉耐-包装码拆垛机械手 - RljnPackagePalletSplitManipulatorDeviceDriver rljnPackagePalletSplitManipulatorDeviceDriver; - //嘉耐-码垛机械手工位 - LnshPalletizingManipulatorSiteDeviceDriver lnshPalletizingManipulatorSiteDeviceDriver; + if (device.getDeviceDriver() instanceof StandardCoveyorControlDeviceDriver) { standardCoveyorControlDeviceDriver = (StandardCoveyorControlDeviceDriver) device.getDeviceDriver(); @@ -536,539 +504,6 @@ public class StageServiceImpl implements StageService { jo.put("isError", standardRGVDeviceDriver.getIserror()); jo.put("container", standardRGVDeviceDriver.getContainer()); jo.put("message", standardRGVDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshStationDeviceDriver) { - lnshStationDeviceDriver = (LnshStationDeviceDriver) device.getDeviceDriver(); - if (lnshStationDeviceDriver.getMode() == 0) { - mode = "未联机"; - } else if (lnshStationDeviceDriver.getMode() == 1) { - mode = "单机"; - } else if (lnshStationDeviceDriver.getMode() == 2) { - mode = "联机"; - } else if (lnshStationDeviceDriver.getMode() == 4) { - mode = "叫料"; - } else if (lnshStationDeviceDriver.getMode() == 5) { - mode = "申请空盘"; - } else if (lnshStationDeviceDriver.getMode() == 6) { - mode = "申请入库"; - } - - if (lnshStationDeviceDriver.getAction() == 0) { - action = "禁止取放"; - } else if (lnshStationDeviceDriver.getAction() == 1) { - action = "允许取货"; - } else if (lnshStationDeviceDriver.getAction() == 2) { - action = "允许放货"; - } else if (lnshStationDeviceDriver.getAction() == 3) { - action = "允许取放"; - } - if (lnshStationDeviceDriver.getIo_action() == 0) { - io_action = "禁止进出"; - } else if (lnshStationDeviceDriver.getIo_action() == 1) { - io_action = "允许进入"; - } else if (lnshStationDeviceDriver.getIo_action() == 2) { - io_action = "允许离开"; - } else if (lnshStationDeviceDriver.getIo_action() == 3) { - io_action = "允许进出"; - } - - if (lnshStationDeviceDriver.getMove() == 0) { - move = "无货"; - } else if (lnshStationDeviceDriver.getMove() == 1) { - move = "有货"; - } else if (lnshStationDeviceDriver.getMove() == 2) { - move = "有托盘有货"; - } - obj.put("device_name", lnshStationDeviceDriver.getDevice().getDevice_name()); - jo.put("mode", mode); - jo.put("move", move); - jo.put("action", action); - jo.put("io_action", io_action); - jo.put("hasGoods", lnshStationDeviceDriver.getHasGoods()); - jo.put("isOnline", lnshStationDeviceDriver.getIsonline()); - jo.put("error", lnshStationDeviceDriver.getError()); - jo.put("isError", lnshStationDeviceDriver.getIserror()); - jo.put("message", lnshStationDeviceDriver.getMessage()); - jo.put("task", lnshStationDeviceDriver.getTask()); - jo.put("weight", lnshStationDeviceDriver.getWeight()); - jo.put("material", lnshStationDeviceDriver.getMaterial()); - jo.put("barcode", lnshStationDeviceDriver.getBarcode()); -// jo.put("specifications", lnshStationDeviceDriver.getSpecifications()); -// jo.put("batch", lnshStationDeviceDriver.getBatch()); - } else if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) { - lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) device.getDeviceDriver(); - if (lnshPalletizingManipulatorSiteDeviceDriver.getMode() == 0) { - mode = "未联机"; - } else if (lnshPalletizingManipulatorSiteDeviceDriver.getMode() == 1) { - mode = "单机"; - } else if (lnshPalletizingManipulatorSiteDeviceDriver.getMode() == 2) { - mode = "联机"; - } else if (lnshPalletizingManipulatorSiteDeviceDriver.getMode() == 4) { - mode = "叫料"; - } else if (lnshPalletizingManipulatorSiteDeviceDriver.getMode() == 5) { - mode = "申请空盘"; - } else if (lnshPalletizingManipulatorSiteDeviceDriver.getMode() == 6) { - mode = "申请入库"; - } - - if (lnshPalletizingManipulatorSiteDeviceDriver.getAction() == 0) { - action = "禁止取放"; - } else if (lnshPalletizingManipulatorSiteDeviceDriver.getAction() == 1) { - action = "允许取货"; - } else if (lnshPalletizingManipulatorSiteDeviceDriver.getAction() == 2) { - action = "允许放货"; - } else if (lnshPalletizingManipulatorSiteDeviceDriver.getAction() == 3) { - action = "允许取放"; - } - if (lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 0) { - io_action = "禁止进出"; - } else if (lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 1) { - io_action = "允许进入"; - } else if (lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 2) { - io_action = "允许离开"; - } else if (lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 3) { - io_action = "允许进出"; - } - - if (lnshPalletizingManipulatorSiteDeviceDriver.getMove() == 0) { - move = "无货"; - } else if (lnshPalletizingManipulatorSiteDeviceDriver.getMove() == 1) { - move = "有货"; - } else if (lnshPalletizingManipulatorSiteDeviceDriver.getMove() == 2) { - move = "有托盘有货"; - } - obj.put("device_name", lnshPalletizingManipulatorSiteDeviceDriver.getDevice().getDevice_name()); - jo.put("mode", mode); - jo.put("move", move); - jo.put("action", action); - jo.put("io_action", io_action); - jo.put("hasGoods", lnshPalletizingManipulatorSiteDeviceDriver.getHasGoods()); - jo.put("isOnline", lnshPalletizingManipulatorSiteDeviceDriver.getIsonline()); - jo.put("error", lnshPalletizingManipulatorSiteDeviceDriver.getError()); - jo.put("isError", lnshPalletizingManipulatorSiteDeviceDriver.getIserror()); - jo.put("message", lnshPalletizingManipulatorSiteDeviceDriver.getMessage()); - jo.put("task", lnshPalletizingManipulatorSiteDeviceDriver.getTask()); - jo.put("weight", lnshPalletizingManipulatorSiteDeviceDriver.getWeight()); - jo.put("material", lnshPalletizingManipulatorSiteDeviceDriver.getMaterial()); - jo.put("barcode", lnshPalletizingManipulatorSiteDeviceDriver.getBarcode()); - jo.put("specifications", lnshPalletizingManipulatorSiteDeviceDriver.getSpecifications()); - jo.put("AlongSide", lnshPalletizingManipulatorSiteDeviceDriver.getAlongSide()); - jo.put("BshortSide", lnshPalletizingManipulatorSiteDeviceDriver.getBshortSide()); - jo.put("Htrapezoidal", lnshPalletizingManipulatorSiteDeviceDriver.getHtrapezoidal()); - jo.put("Wthickness", lnshPalletizingManipulatorSiteDeviceDriver.getWthickness()); - jo.put("batch", lnshPalletizingManipulatorSiteDeviceDriver.getBatch()); - } else if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorDeviceDriver) { - lnshPalletizingManipulatorDeviceDriver = (LnshPalletizingManipulatorDeviceDriver) device.getDeviceDriver(); - if (lnshPalletizingManipulatorDeviceDriver.getMode() == 0) { - mode = "未联机"; - } else if (lnshPalletizingManipulatorDeviceDriver.getMode() == 1) { - mode = "单机"; - } else if (lnshPalletizingManipulatorDeviceDriver.getMode() == 2) { - mode = "联机"; - } else if (lnshPalletizingManipulatorDeviceDriver.getMode() == 3) { - mode = "工作中"; - } else if (lnshPalletizingManipulatorDeviceDriver.getMode() == 4) { - mode = "获取托盘信息"; - } else if (lnshPalletizingManipulatorDeviceDriver.getMode() == 5) { - mode = "码垛完成"; - } else if (lnshPalletizingManipulatorDeviceDriver.getMode() == 6) { - mode = "码垛强制完成"; - } else if (lnshPalletizingManipulatorDeviceDriver.getMode() == 7) { - mode = "申请空盘"; - } - - if (lnshPalletizingManipulatorDeviceDriver.getStatus() == 1) { - status = "待机"; - } else if (lnshPalletizingManipulatorDeviceDriver.getStatus() == 2) { - status = "生产中"; - } else if (lnshPalletizingManipulatorDeviceDriver.getStatus() == 3) { - status = "故障"; - } - - if (lnshPalletizingManipulatorDeviceDriver.getAction() == 0) { - action = "禁止取放"; - } else if (lnshPalletizingManipulatorDeviceDriver.getAction() == 1) { - action = "允许取货"; - } else if (lnshPalletizingManipulatorDeviceDriver.getAction() == 2) { - action = "允许放货"; - } else if (lnshPalletizingManipulatorDeviceDriver.getAction() == 3) { - action = "允许取放"; - } - - obj.put("device_name", lnshPalletizingManipulatorDeviceDriver.getDevice().getDevice_name()); - jo.put("mode", mode); - jo.put("status", status); - jo.put("action", action); - jo.put("isOnline", lnshPalletizingManipulatorDeviceDriver.getIsonline()); - jo.put("error", lnshPalletizingManipulatorDeviceDriver.getError()); - jo.put("put_station", lnshPalletizingManipulatorDeviceDriver.getPut_station()); - jo.put("material", lnshPalletizingManipulatorDeviceDriver.getMaterial()); - jo.put("encoder_qty", lnshPalletizingManipulatorDeviceDriver.getEncoder_qty()); -// jo.put("specifications", lnshPalletizingManipulatorDeviceDriver.getSpecifications()); -// jo.put("batch", lnshPalletizingManipulatorDeviceDriver.getBatch()); - jo.put("isError", lnshPalletizingManipulatorDeviceDriver.getIserror()); - jo.put("message", lnshPalletizingManipulatorDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshKilnLaneDeviceDriver) { - lnshKilnLaneDeviceDriver = (LnshKilnLaneDeviceDriver) device.getDeviceDriver(); - if (lnshKilnLaneDeviceDriver.getMode() == 0) { - mode = "未联机"; - } else if (lnshKilnLaneDeviceDriver.getMode() == 1) { - mode = "单机"; - } else if (lnshKilnLaneDeviceDriver.getMode() == 2) { - mode = "联机"; - } - - if (lnshKilnLaneDeviceDriver.getStatus() == 1) { - status = "待机"; - } else if (lnshKilnLaneDeviceDriver.getStatus() == 2) { - status = "生产中"; - } else if (lnshKilnLaneDeviceDriver.getStatus() == 3) { - status = "故障"; - } - - obj.put("device_name", lnshKilnLaneDeviceDriver.getDevice().getDevice_name()); - jo.put("mode", mode); - jo.put("status", status); - jo.put("isOnline", lnshKilnLaneDeviceDriver.getIsonline()); - jo.put("error", lnshKilnLaneDeviceDriver.getError()); - jo.put("isError", lnshKilnLaneDeviceDriver.getIserror()); - jo.put("open_time", lnshKilnLaneDeviceDriver.getOpen_time()); - jo.put("standby_time", lnshKilnLaneDeviceDriver.getStandby_time()); - jo.put("production_time", lnshKilnLaneDeviceDriver.getProduction_time()); - jo.put("error_time", lnshKilnLaneDeviceDriver.getError_time()); - jo.put("car_sum", lnshKilnLaneDeviceDriver.getCar_sum()); - 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 LnshPackagePalletManipulatorDeviceDriver) { - lnshPackagePalletManipulatorDeviceDriver = (LnshPackagePalletManipulatorDeviceDriver) device.getDeviceDriver(); - if (lnshPackagePalletManipulatorDeviceDriver.getMode() == 0) { - mode = "未联机"; - } else if (lnshPackagePalletManipulatorDeviceDriver.getMode() == 1) { - mode = "单机"; - } else if (lnshPackagePalletManipulatorDeviceDriver.getMode() == 2) { - mode = "联机"; - } else if (lnshPackagePalletManipulatorDeviceDriver.getMode() == 3) { - mode = "运行中"; - } else if (lnshPackagePalletManipulatorDeviceDriver.getMode() == 4) { - mode = "人工排产确认"; - } else if (lnshPackagePalletManipulatorDeviceDriver.getMode() == 5) { - mode = "获取托盘信息"; - } else if (lnshPackagePalletManipulatorDeviceDriver.getMode() == 6) { - mode = "码垛完成"; - } else if (lnshPackagePalletManipulatorDeviceDriver.getMode() == 7) { - mode = "码垛强制完成"; - } else if (lnshPackagePalletManipulatorDeviceDriver.getMode() == 8) { - mode = "申请空盘"; - } - - if (lnshPackagePalletManipulatorDeviceDriver.getStatus() == 1) { - status = "待机"; - } else if (lnshPackagePalletManipulatorDeviceDriver.getStatus() == 2) { - status = "生产中"; - } else if (lnshPackagePalletManipulatorDeviceDriver.getStatus() == 3) { - status = "故障"; - } - String onoff_status = ""; - -// if (lnshPackagePalletManipulatorDeviceDriver.getOnoff_status() == 1) { -// onoff_status = "关机"; -// } else if (lnshPackagePalletManipulatorDeviceDriver.getOnoff_status() == 2) { -// onoff_status = "开机"; -// } - - obj.put("device_name", lnshPackagePalletManipulatorDeviceDriver.getDevice().getDevice_name()); - jo.put("mode", mode); - jo.put("status", status); - jo.put("onoff_status", onoff_status); -// jo.put("specifications", lnshPackagePalletManipulatorDeviceDriver.getSpecifications()); -// jo.put("batch", lnshPackagePalletManipulatorDeviceDriver.getBatch()); - jo.put("isOnline", lnshPackagePalletManipulatorDeviceDriver.getIsonline()); - jo.put("error", lnshPackagePalletManipulatorDeviceDriver.getError()); - jo.put("putStation", lnshPackagePalletManipulatorDeviceDriver.getPut_station()); - jo.put("barcode", lnshPackagePalletManipulatorDeviceDriver.getBarcode()); - jo.put("material", lnshPackagePalletManipulatorDeviceDriver.getMaterial()); - jo.put("qty", lnshPackagePalletManipulatorDeviceDriver.getQty()); - jo.put("open_time", lnshPackagePalletManipulatorDeviceDriver.getOpen_time()); - jo.put("standby_time", lnshPackagePalletManipulatorDeviceDriver.getStandby_time()); - jo.put("production_time", lnshPackagePalletManipulatorDeviceDriver.getProduction_time()); - jo.put("error_time", lnshPackagePalletManipulatorDeviceDriver.getError_time()); - jo.put("order_No", lnshPackagePalletManipulatorDeviceDriver.getOrder_No()); - jo.put("isError", lnshPackagePalletManipulatorDeviceDriver.getIserror()); - jo.put("message", lnshPackagePalletManipulatorDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof RljnPackagePalletSplitManipulatorDeviceDriver) { - rljnPackagePalletSplitManipulatorDeviceDriver = (RljnPackagePalletSplitManipulatorDeviceDriver) device.getDeviceDriver(); - jo.put("device_code", device.getDevice_code()); - jo.put("mode", rljnPackagePalletSplitManipulatorDeviceDriver.getMode()); - jo.put("status", rljnPackagePalletSplitManipulatorDeviceDriver.getStatus()); - jo.put("isOnline", rljnPackagePalletSplitManipulatorDeviceDriver.getIsonline()); - jo.put("error", rljnPackagePalletSplitManipulatorDeviceDriver.getError()); - jo.put("putStation", rljnPackagePalletSplitManipulatorDeviceDriver.getPut_station()); - jo.put("barcode", rljnPackagePalletSplitManipulatorDeviceDriver.getBarcode()); - jo.put("material", rljnPackagePalletSplitManipulatorDeviceDriver.getMaterial()); - jo.put("qty", rljnPackagePalletSplitManipulatorDeviceDriver.getQty()); - jo.put("open_time", rljnPackagePalletSplitManipulatorDeviceDriver.getOpen_time()); - jo.put("standby_time", rljnPackagePalletSplitManipulatorDeviceDriver.getStandby_time()); - jo.put("production_time", rljnPackagePalletSplitManipulatorDeviceDriver.getProduction_time()); - jo.put("error_time", rljnPackagePalletSplitManipulatorDeviceDriver.getError_time()); - jo.put("order_No", rljnPackagePalletSplitManipulatorDeviceDriver.getOrder_No()); - jo.put("onoff_status", rljnPackagePalletSplitManipulatorDeviceDriver.getOnoff_status()); - jo.put("getStation", rljnPackagePalletSplitManipulatorDeviceDriver.getGetStation()); - jo.put("specifications", rljnPackagePalletSplitManipulatorDeviceDriver.getSpecifications()); - jo.put("batch", rljnPackagePalletSplitManipulatorDeviceDriver.getBatch()); - jo.put("total_split", rljnPackagePalletSplitManipulatorDeviceDriver.getTotal_split()); - jo.put("isError", rljnPackagePalletSplitManipulatorDeviceDriver.getIserror()); - jo.put("message", rljnPackagePalletSplitManipulatorDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshLabelingMachineDeviceDriver) { - lnshLabelingMachineDeviceDriver = (LnshLabelingMachineDeviceDriver) device.getDeviceDriver(); - if (lnshLabelingMachineDeviceDriver.getMode() == 0) { - mode = "未联机"; - } else if (lnshLabelingMachineDeviceDriver.getMode() == 1) { - mode = "单机"; - } else if (lnshLabelingMachineDeviceDriver.getMode() == 2) { - mode = "联机"; - } else if (lnshLabelingMachineDeviceDriver.getMode() == 3) { - mode = "运行中"; - } - - if (lnshLabelingMachineDeviceDriver.getStatus() == 1) { - status = "待机"; - } else if (lnshLabelingMachineDeviceDriver.getStatus() == 2) { - status = "生产中"; - } else if (lnshLabelingMachineDeviceDriver.getStatus() == 3) { - status = "故障"; - } - - obj.put("device_name", lnshLabelingMachineDeviceDriver.getDevice().getDevice_name()); - jo.put("mode", mode); - jo.put("status", status); - jo.put("isOnline", lnshLabelingMachineDeviceDriver.getIsonline()); - jo.put("open_time", lnshLabelingMachineDeviceDriver.getOpen_time()); - jo.put("close_time", lnshLabelingMachineDeviceDriver.getClose_time()); - jo.put("standby_time", lnshLabelingMachineDeviceDriver.getStandby_time()); - jo.put("production_time", lnshLabelingMachineDeviceDriver.getProduction_time()); - jo.put("error_time", lnshLabelingMachineDeviceDriver.getError_time()); - jo.put("labeling_qty", lnshLabelingMachineDeviceDriver.getLabeling_qty()); - jo.put("isError", lnshLabelingMachineDeviceDriver.getIserror()); - jo.put("message", lnshLabelingMachineDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshSplitManipulatorDeviceDriver) { - lnshSplitManipulatorDeviceDriver = (LnshSplitManipulatorDeviceDriver) device.getDeviceDriver(); - if (lnshSplitManipulatorDeviceDriver.getMode() == 0) { - mode = "未联机"; - } else if (lnshSplitManipulatorDeviceDriver.getMode() == 1) { - mode = "单机"; - } else if (lnshSplitManipulatorDeviceDriver.getMode() == 2) { - mode = "联机"; - } else if (lnshSplitManipulatorDeviceDriver.getMode() == 3) { - mode = "工作中"; - } else if (lnshSplitManipulatorDeviceDriver.getMode() == 5) { - mode = "获取托盘信息"; - } else if (lnshSplitManipulatorDeviceDriver.getMode() == 6) { - mode = "拆垛完成"; - } else if (lnshSplitManipulatorDeviceDriver.getMode() == 7) { - mode = "申请空盘"; - } - - String onoff_status = ""; -// if (lnshSplitManipulatorDeviceDriver.getOnoff_status() == 0) { -// onoff_status = "关机"; -// } else if (lnshSplitManipulatorDeviceDriver.getOnoff_status() == 1) { -// onoff_status = "开机"; -// } - obj.put("device_name", lnshSplitManipulatorDeviceDriver.getDevice().getDevice_name()); - jo.put("mode", mode); - jo.put("isOnline", lnshSplitManipulatorDeviceDriver.getIsonline()); - jo.put("error", lnshSplitManipulatorDeviceDriver.getError()); - jo.put("getStation", lnshSplitManipulatorDeviceDriver.getGetStation()); - jo.put("barcode", lnshSplitManipulatorDeviceDriver.getBarcode()); - jo.put("material", lnshSplitManipulatorDeviceDriver.getMaterial()); - jo.put("total_split", lnshSplitManipulatorDeviceDriver.getTotal_split()); - jo.put("open_time", lnshSplitManipulatorDeviceDriver.getOpen_time()); - jo.put("standby_time", lnshSplitManipulatorDeviceDriver.getStandby_time()); - jo.put("production_time", lnshSplitManipulatorDeviceDriver.getProduction_time()); - jo.put("error_time", lnshSplitManipulatorDeviceDriver.getError_time()); -// jo.put("batch", lnshSplitManipulatorDeviceDriver.getBatch()); -// jo.put("specifications", lnshSplitManipulatorDeviceDriver.getSpecifications()); -// jo.put("qty", lnshSplitManipulatorDeviceDriver.getQty()); - jo.put("onoff_status", onoff_status); - jo.put("isError", lnshSplitManipulatorDeviceDriver.getIserror()); - jo.put("message", lnshSplitManipulatorDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) { - lnshLaminatingMachineDeviceDriver = (LnshLaminatingMachineDeviceDriver) device.getDeviceDriver(); - if (lnshLaminatingMachineDeviceDriver.getMode() == 0) { - mode = "未联机"; - } else if (lnshLaminatingMachineDeviceDriver.getMode() == 1) { - mode = "单机"; - } else if (lnshLaminatingMachineDeviceDriver.getMode() == 2) { - mode = "联机"; - } else if (lnshLaminatingMachineDeviceDriver.getMode() == 3) { - mode = "运行中"; - } - - obj.put("device_name", lnshLaminatingMachineDeviceDriver.getDevice().getDevice_name()); - jo.put("mode", mode); - jo.put("move", move); - jo.put("container_type", lnshLaminatingMachineDeviceDriver.getContainer_type()); -// jo.put("barcode", lnshLaminatingMachineDeviceDriver.getBarcode()); - jo.put("task", lnshLaminatingMachineDeviceDriver.getTask()); - jo.put("error", lnshLaminatingMachineDeviceDriver.getError()); - jo.put("isOnline", lnshLaminatingMachineDeviceDriver.getIsonline()); - jo.put("isError", lnshLaminatingMachineDeviceDriver.getIserror()); - jo.put("message", lnshLaminatingMachineDeviceDriver.getMessage()); - } else if (device.getDeviceDriver() instanceof LnshRGVDeviceDriver) { - lnshRGVDeviceDriver = (LnshRGVDeviceDriver) device.getDeviceDriver(); - String move_1 = ""; - String move_2 = ""; - String action_1 = ""; - String action_2 = ""; - String walk_y = ""; - - if (lnshRGVDeviceDriver.getMode() == 0) { - mode = "未联机"; - } else if (lnshRGVDeviceDriver.getMode() == 1) { - mode = "单机"; - } else if (lnshRGVDeviceDriver.getMode() == 2) { - mode = "联机"; - } else if (lnshRGVDeviceDriver.getMode() == 3) { - mode = "运行中"; - } - - if (lnshRGVDeviceDriver.getStatus() == 1) { - status = "待机"; - } else if (lnshRGVDeviceDriver.getStatus() == 2) { - status = "生产中"; - } else if (lnshRGVDeviceDriver.getStatus() == 3) { - status = "故障"; - } - - if (lnshRGVDeviceDriver.getMove_1() == 0) { - move_1 = "无货"; - } else if (lnshRGVDeviceDriver.getMove_1() == 1) { - move_1 = "有货"; - } else if (lnshRGVDeviceDriver.getMove_1() == 2) { - move_1 = "有托盘有货"; - } - - if (lnshRGVDeviceDriver.getMove_2() == 0) { - move_2 = "无货"; - } else if (lnshRGVDeviceDriver.getMove_2() == 1) { - move_2 = "有货"; - } else if (lnshRGVDeviceDriver.getMove_2() == 2) { - move_2 = "有托盘有货"; - } - - if (lnshRGVDeviceDriver.getAction_1() == 1) { - action_1 = "取货中"; - } else if (lnshRGVDeviceDriver.getAction_1() == 2) { - action_1 = "取货完成"; - } else if (lnshRGVDeviceDriver.getAction_1() == 3) { - action_1 = "放货中"; - } else if (lnshRGVDeviceDriver.getAction_1() == 4) { - action_1 = "放货完成"; - } - - if (lnshRGVDeviceDriver.getAction_2() == 1) { - action_2 = "取货中"; - } else if (lnshRGVDeviceDriver.getAction_2() == 2) { - action_2 = "取货完成"; - } else if (lnshRGVDeviceDriver.getAction_2() == 3) { - action_2 = "放货中"; - } else if (lnshRGVDeviceDriver.getAction_2() == 4) { - action_2 = "放货完成"; - } - - if (lnshRGVDeviceDriver.getWalk_y() == 0) { - walk_y = "原位"; - } else if (lnshRGVDeviceDriver.getWalk_y() == 2) { - walk_y = "非原位"; - } - - obj.put("device_name", lnshRGVDeviceDriver.getDevice().getDevice_name()); - jo.put("mode", mode); - jo.put("status", status); - jo.put("move_1", move_1); - jo.put("move_2", move_2); - jo.put("action_1", action_1); - jo.put("action_2", action_2); - jo.put("walk_y", walk_y); - jo.put("error", lnshRGVDeviceDriver.getError()); - jo.put("task1", lnshRGVDeviceDriver.getTask1()); - jo.put("task2", lnshRGVDeviceDriver.getTask2()); - jo.put("isOnline", lnshRGVDeviceDriver.getIsonline()); - jo.put("isError", lnshRGVDeviceDriver.getIserror()); - jo.put("message", lnshRGVDeviceDriver.getMessage()); - jo.put("open_time", lnshRGVDeviceDriver.getOpen_time()); - jo.put("standby_time", lnshRGVDeviceDriver.getStandby_time()); - jo.put("production_time", lnshRGVDeviceDriver.getProduction_time()); - jo.put("error_time", lnshRGVDeviceDriver.getError_time()); -// jo.put("task_qty", lnshRGVDeviceDriver.getTask_qty()); -// jo.put("finishTask_qty", lnshRGVDeviceDriver.getFinishTask_qty()); -// jo.put("batch", lnshRGVDeviceDriver.getBatch()); -// jo.put("specifications", lnshRGVDeviceDriver.getSpecifications()); -// jo.put("qty", lnshRGVDeviceDriver.getQty()); - } else if (device.getDeviceDriver() instanceof LnshOneRGVDeviceDriver) { - lnshOneRGVDeviceDriver = (LnshOneRGVDeviceDriver) device.getDeviceDriver(); - String move_1 = ""; - String action_1 = ""; - String walk_y = ""; - - if (lnshOneRGVDeviceDriver.getMode() == 0) { - mode = "未联机"; - } else if (lnshOneRGVDeviceDriver.getMode() == 1) { - mode = "单机"; - } else if (lnshOneRGVDeviceDriver.getMode() == 2) { - mode = "联机"; - } else if (lnshOneRGVDeviceDriver.getMode() == 3) { - mode = "运行中"; - } - - if (lnshOneRGVDeviceDriver.getStatus() == 1) { - status = "待机"; - } else if (lnshOneRGVDeviceDriver.getStatus() == 2) { - status = "生产中"; - } else if (lnshOneRGVDeviceDriver.getStatus() == 3) { - status = "故障"; - } - - if (lnshOneRGVDeviceDriver.getMove_1() == 0) { - move_1 = "无货"; - } else if (lnshOneRGVDeviceDriver.getMove_1() == 1) { - move_1 = "有货"; - } else if (lnshOneRGVDeviceDriver.getMove_1() == 2) { - move_1 = "有托盘有货"; - } - - if (lnshOneRGVDeviceDriver.getAction_1() == 1) { - action_1 = "取货中"; - } else if (lnshOneRGVDeviceDriver.getAction_1() == 2) { - action_1 = "取货完成"; - } else if (lnshOneRGVDeviceDriver.getAction_1() == 3) { - action_1 = "放货中"; - } else if (lnshOneRGVDeviceDriver.getAction_1() == 4) { - action_1 = "放货完成"; - } - - if (lnshOneRGVDeviceDriver.getWalk_y() == 0) { - walk_y = "原位"; - } else if (lnshOneRGVDeviceDriver.getWalk_y() == 2) { - walk_y = "非原位"; - } - - obj.put("device_name", lnshOneRGVDeviceDriver.getDevice().getDevice_name()); - jo.put("mode", mode); - jo.put("status", status); - jo.put("move_1", move_1); - jo.put("action_1", action_1); - jo.put("walk_y", walk_y); - jo.put("error", lnshOneRGVDeviceDriver.getError()); - jo.put("task1", lnshOneRGVDeviceDriver.getTask1()); - jo.put("isOnline", lnshOneRGVDeviceDriver.getIsonline()); - jo.put("isError", lnshOneRGVDeviceDriver.getIserror()); - jo.put("message", lnshOneRGVDeviceDriver.getMessage()); - jo.put("task_qty", lnshOneRGVDeviceDriver.getTask_qty()); - jo.put("finishTask_qty", lnshOneRGVDeviceDriver.getFinishTask_qty()); - jo.put("batch", lnshOneRGVDeviceDriver.getBatch()); - jo.put("specifications", lnshOneRGVDeviceDriver.getSpecifications()); - jo.put("qty", lnshOneRGVDeviceDriver.getQty()); } obj.put("data", jo); obj.put("device_code", js.get("device_code")); diff --git a/acs/qd/src/views/acs/device/config.vue b/acs/qd/src/views/acs/device/config.vue index 5e77338..0499073 100644 --- a/acs/qd/src/views/acs/device/config.vue +++ b/acs/qd/src/views/acs/device/config.vue @@ -89,37 +89,11 @@ import standard_conveyor_control_with_scanner from '@/views/acs/device/driver/st import standard_conveyor_control_with_plcscanner from '@/views/acs/device/driver/standard_conveyor_control_with_plcscanner' import standard_conveyor_control from '@/views/acs/device/driver/standard_conveyor_control' import standard_conveyor_monitor from '@/views/acs/device/driver/standard_conveyor_monitor' -import non_line_manipulator_inspect_site from '@/views/acs/device/driver/non_line_manipulator_inspect_site' -import non_line_inspect_site from '@/views/acs/device/driver/non_line_inspect_site' import manipulator_inspect_site_NDC from '@/views/acs/device/driver/manipulator_inspect_site_NDC' -import feedback_agv_status_site from '@/views/acs/device/driver/feedback_agv_status_site' import standard_manipulator_stacking_site from '@/views/acs/device/driver/standard_manipulator_stacking_site' import standard_photoelectric_inspect_site from '@/views/acs/device/driver/standard_photoelectric_inspect_site' -import ndxy_special from '@/views/acs/device/driver/ndxy_special' import hailiang_labeling from '@/views/acs/device/driver/hailiang_labeling' -import ndxy_special_two from '@/views/acs/device/driver/ndxy_special_two' -import whxr_storage_conveyor from '@/views/acs/device/driver/whxr/whxr_storage_conveyor' -import whxr_ball_mill from '@/views/acs/device/driver/whxr/whxr_ball_mill' -import whxr_spary_tower from '@/views/acs/device/driver/whxr/whxr_spary_power' -import whxr_weight from '@/views/acs/device/driver/whxr/whxr_weight' import electric_fence from '@/views/acs/device/driver/electric_fence' -import lnsh_mixing_mill from '@/views/acs/device/driver/lnsh/lnsh_mixing_mill' -import lnsh_press from '@/views/acs/device/driver/lnsh/lnsh_press' -import lnsh_palletizing_manipulator from '@/views/acs/device/driver/lnsh/lnsh_palletizing_manipulator' -import lnsh_kiln_truss from '@/views/acs/device/driver/lnsh/lnsh_kiln_truss' -import lnsh_out_kiln_truss from '@/views/acs/device/driver/lnsh/lnsh_out_kiln_truss' -import lnsh_pallet_storage from '@/views/acs/device/driver/lnsh/lnsh_pallet_storage' -import lnsh_labeling_machine from '@/views/acs/device/driver/lnsh/lnsh_labeling_machine' -import lnsh_split_manipulator from '@/views/acs/device/driver/lnsh/lnsh_split_manipulator' -import lnsh_rgv from '@/views/acs/device/driver/lnsh/lnsh_rgv' -import lnsh_fold_disc_site from '@/views/acs/device/driver/lnsh/lnsh_fold_disc_site' -import lnsh_kiln_lane from '@/views/acs/device/driver/lnsh/lnsh_kiln_lane' -import lnsh_package_line from '@/views/acs/device/driver/lnsh/lnsh_package_line' -import lnsh_package_pallet_manipulator from '@/views/acs/device/driver/lnsh/lnsh_package_pallet_manipulator' -import lnsh_station from '@/views/acs/device/driver/lnsh/lnsh_station' -import lnsh_Laminating_machine from '@/views/acs/device/driver/lnsh/lnsh_Laminating_machine' -import lnsh_package_site from '@/views/acs/device/driver/lnsh/lnsh_package_site' -import lnsh_crusher from '@/views/acs/device/driver/lnsh/lnsh_crusher' export default { name: 'DeviceConfig', @@ -129,9 +103,7 @@ export default { standard_conveyor_control_with_plcscanner, standard_conveyor_control, standard_conveyor_monitor, weighing_site, machines_site, non_line_manipulator_inspect_site, non_line_inspect_site, manipulator_inspect_site_NDC, feedback_agv_status_site, standard_manipulator_stacking_site, standard_photoelectric_inspect_site, ndxy_special, hailiang_labeling, ndxy_special_two, whxr_storage_conveyor, whxr_ball_mill, whxr_spary_tower, whxr_weight, - electric_fence, lnsh_mixing_mill, lnsh_press, lnsh_palletizing_manipulator, lnsh_fold_disc_site, lnsh_kiln_lane, lnsh_kiln_truss, - lnsh_package_line, lnsh_out_kiln_truss, lnsh_package_pallet_manipulator, lnsh_pallet_storage, lnsh_labeling_machine, lnsh_split_manipulator, lnsh_rgv, - lnsh_station, lnsh_Laminating_machine, lnsh_package_site, lnsh_crusher }, + electric_fence, lnsh_mixing_mill, lnsh_press, lnsh_palletizing_manipulator }, dicts: ['device_type'], mixins: [crud], data() { diff --git a/acs/qd/src/views/acs/device/driver/feedback_agv_status_site.vue b/acs/qd/src/views/acs/device/driver/feedback_agv_status_site.vue deleted file mode 100644 index e7384aa..0000000 --- a/acs/qd/src/views/acs/device/driver/feedback_agv_status_site.vue +++ /dev/null @@ -1,331 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_Laminating_machine.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_Laminating_machine.vue deleted file mode 100644 index 8d7b59b..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_Laminating_machine.vue +++ /dev/null @@ -1,494 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_crusher.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_crusher.vue deleted file mode 100644 index 53dee78..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_crusher.vue +++ /dev/null @@ -1,474 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_fold_disc_site.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_fold_disc_site.vue deleted file mode 100644 index 2abf5fa..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_fold_disc_site.vue +++ /dev/null @@ -1,488 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_kiln_lane.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_kiln_lane.vue deleted file mode 100644 index e7b5c82..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_kiln_lane.vue +++ /dev/null @@ -1,488 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_kiln_truss.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_kiln_truss.vue deleted file mode 100644 index 4594ef6..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_kiln_truss.vue +++ /dev/null @@ -1,488 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_labeling_machine.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_labeling_machine.vue deleted file mode 100644 index 1680294..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_labeling_machine.vue +++ /dev/null @@ -1,486 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_mixing_mill.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_mixing_mill.vue deleted file mode 100644 index a1f1b9a..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_mixing_mill.vue +++ /dev/null @@ -1,518 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_out_kiln_truss.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_out_kiln_truss.vue deleted file mode 100644 index a9892cf..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_out_kiln_truss.vue +++ /dev/null @@ -1,488 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_package_line.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_package_line.vue deleted file mode 100644 index ac205be..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_package_line.vue +++ /dev/null @@ -1,488 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_package_pallet_manipulator.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_package_pallet_manipulator.vue deleted file mode 100644 index e8184d5..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_package_pallet_manipulator.vue +++ /dev/null @@ -1,488 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_package_site.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_package_site.vue deleted file mode 100644 index fdacbb7..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_package_site.vue +++ /dev/null @@ -1,474 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_pallet_storage.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_pallet_storage.vue deleted file mode 100644 index 7470359..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_pallet_storage.vue +++ /dev/null @@ -1,488 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_palletizing_manipulator.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_palletizing_manipulator.vue deleted file mode 100644 index 7ac3c96..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_palletizing_manipulator.vue +++ /dev/null @@ -1,488 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_press.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_press.vue deleted file mode 100644 index 1eb49d6..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_press.vue +++ /dev/null @@ -1,488 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_rgv.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_rgv.vue deleted file mode 100644 index 39a7c28..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_rgv.vue +++ /dev/null @@ -1,589 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_split_manipulator.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_split_manipulator.vue deleted file mode 100644 index f7d3193..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_split_manipulator.vue +++ /dev/null @@ -1,488 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_station.vue b/acs/qd/src/views/acs/device/driver/lnsh/lnsh_station.vue deleted file mode 100644 index 777974c..0000000 --- a/acs/qd/src/views/acs/device/driver/lnsh/lnsh_station.vue +++ /dev/null @@ -1,471 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/ndxy_special.vue b/acs/qd/src/views/acs/device/driver/ndxy_special.vue deleted file mode 100644 index 7e12052..0000000 --- a/acs/qd/src/views/acs/device/driver/ndxy_special.vue +++ /dev/null @@ -1,507 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/ndxy_special_two.vue b/acs/qd/src/views/acs/device/driver/ndxy_special_two.vue deleted file mode 100644 index 25bccb7..0000000 --- a/acs/qd/src/views/acs/device/driver/ndxy_special_two.vue +++ /dev/null @@ -1,487 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/non_line_inspect_site.vue b/acs/qd/src/views/acs/device/driver/non_line_inspect_site.vue deleted file mode 100644 index b252314..0000000 --- a/acs/qd/src/views/acs/device/driver/non_line_inspect_site.vue +++ /dev/null @@ -1,220 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/non_line_manipulator_inspect_site.vue b/acs/qd/src/views/acs/device/driver/non_line_manipulator_inspect_site.vue deleted file mode 100644 index e0df177..0000000 --- a/acs/qd/src/views/acs/device/driver/non_line_manipulator_inspect_site.vue +++ /dev/null @@ -1,220 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/special_ordinary_site.vue b/acs/qd/src/views/acs/device/driver/special_ordinary_site.vue deleted file mode 100644 index 94d3eaa..0000000 --- a/acs/qd/src/views/acs/device/driver/special_ordinary_site.vue +++ /dev/null @@ -1,221 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/whxr/whxr_ball_mill.vue b/acs/qd/src/views/acs/device/driver/whxr/whxr_ball_mill.vue deleted file mode 100644 index 8895c65..0000000 --- a/acs/qd/src/views/acs/device/driver/whxr/whxr_ball_mill.vue +++ /dev/null @@ -1,351 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/whxr/whxr_spary_power.vue b/acs/qd/src/views/acs/device/driver/whxr/whxr_spary_power.vue deleted file mode 100644 index 9c87417..0000000 --- a/acs/qd/src/views/acs/device/driver/whxr/whxr_spary_power.vue +++ /dev/null @@ -1,351 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/whxr/whxr_storage_conveyor.vue b/acs/qd/src/views/acs/device/driver/whxr/whxr_storage_conveyor.vue deleted file mode 100644 index 4f34037..0000000 --- a/acs/qd/src/views/acs/device/driver/whxr/whxr_storage_conveyor.vue +++ /dev/null @@ -1,122 +0,0 @@ - - - - - diff --git a/acs/qd/src/views/acs/device/driver/whxr/whxr_weight.vue b/acs/qd/src/views/acs/device/driver/whxr/whxr_weight.vue deleted file mode 100644 index 9c87417..0000000 --- a/acs/qd/src/views/acs/device/driver/whxr/whxr_weight.vue +++ /dev/null @@ -1,351 +0,0 @@ - - - - -