From d7a23bbf66445e5d76de167ab1c9816ace0160c8 Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Thu, 9 Apr 2026 15:13:26 +0800 Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E6=9C=A8=E7=AE=B1=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=A1=81=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agv/ndctwo/AgvNdcTwoDeviceDriver.java | 765 ++++++++++-------- .../BeltConveyorDeviceDriver.java | 12 +- .../conveyor/belt_conveyor/ItemProtocol.java | 6 +- .../optoele_docking_station/ItemProtocol.java | 88 ++ .../OptoeleDockingStationDefination.java | 61 ++ .../OptoeleDockingStationDeviceDriver.java | 63 ++ .../BoxStorageManipulatorDeviceDriver.java | 59 +- .../box_storage_manipulator/ItemProtocol.java | 16 + .../PlugPullDeviceSiteDeviceDriver.java | 1 - .../acs/ext/wms/service/AcsToWmsService.java | 4 + .../wms/service/impl/AcsToWmsServiceImpl.java | 29 + .../src/main/resources/logback-spring.xml | 7 +- acs2/nladmin-ui/.env.development | 2 +- acs2/nladmin-ui/.env.production | 4 +- .../src/views/acs/device/config.vue | 4 +- .../device/driver/optoele_docking_station.vue | 539 ++++++++++++ 16 files changed, 1295 insertions(+), 365 deletions(-) create mode 100644 acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/optoele_docking_station/ItemProtocol.java create mode 100644 acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/optoele_docking_station/OptoeleDockingStationDefination.java create mode 100644 acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/optoele_docking_station/OptoeleDockingStationDeviceDriver.java create mode 100644 acs2/nladmin-ui/src/views/acs/device/driver/optoele_docking_station.vue diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java index 9056a70ef..8d4198f83 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java @@ -17,6 +17,7 @@ import org.nl.acs.device.service.DeviceService; import org.nl.acs.device_driver.DeviceDriver; import org.nl.acs.device_driver.FeedLmsRealFailed; import org.nl.acs.device_driver.agv.utils.TwoAgvPhase; +import org.nl.acs.device_driver.conveyor.optoele_docking_station.OptoeleDockingStationDeviceDriver; import org.nl.acs.device_driver.conveyor.standard_inspect_site.StandardInspectSiteDeviceDriver; import org.nl.acs.device_driver.conveyor.standard_ordinary_site.StandardOrdinarySiteDeviceDriver; import org.nl.acs.device_driver.paper_tube_pick_site.PaperTubePickSiteDeviceDriver; @@ -49,6 +50,7 @@ import org.nl.config.thread.ThreadPoolExecutorUtil; import org.nl.system.service.dict.ISysDictService; import org.nl.system.service.dict.dao.Dict; import org.nl.system.service.param.ISysParamService; +import org.nl.system.service.param.dao.Param; import org.nl.config.SpringContextHolder; import java.time.LocalTime; @@ -108,15 +110,31 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic Boolean iserror = false; boolean isCharge = false; + private String getSysParamValueOrDefault(String code, String defaultValue) { + try { + if (ObjectUtil.isEmpty(ISysParamService)) { + return defaultValue; + } + Param param = ISysParamService.findByCode(code); + if (ObjectUtil.isEmpty(param) || StrUtil.isBlank(param.getValue())) { + return defaultValue; + } + return param.getValue(); + } catch (Exception e) { + return defaultValue; + } + } + /** * 更新AGV状态信息到TwoFloorAgvStatusService - * @param arr socket数据数组 - * @param carno 车号 - * @param phase 当前阶段 - * @param ikey 任务号 + * + * @param arr socket数据数组 + * @param carno 车号 + * @param phase 当前阶段 + * @param ikey 任务号 * @param agvaddr 站点号 - * @param inst 指令信息 - * @param task 任务信息 + * @param inst 指令信息 + * @param task 任务信息 */ public TwoFloorAgvStatus updateAgvStatusToService(int[] arr, int carno, int phase, int ikey, int agvaddr, Instruction inst, TaskDto task) { if (carno == 0) { @@ -193,7 +211,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic * @param expectValue * @param actualVaue */ - public void recordTaskStuckReason(int carno,TwoFloorAgvStatus agvStatus, String device_code, String driver, String message,Map expectValue,Map actualVaue) { + public void recordTaskStuckReason(int carno, TwoFloorAgvStatus agvStatus, String device_code, String driver, String message, Map expectValue, Map actualVaue) { try { // 解析错误信息，提取action和mode不满足的原因 String act_action = String.valueOf(actualVaue.get("act_action")); @@ -224,19 +242,19 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic agvStatus.setExp_move(exp_move); agvStatus.setExp_error(exp_error); - StringBuffer messageSb = new StringBuffer(); - messageSb.append("任务异常,phase"+agvStatus.getPhase()); - if(expectValue.get("ept_action")!=null){ - messageSb.append(", 期望action："+exp_action+" 实际action："+act_action); - } - if(expectValue.get("ept_mode")!=null){ - messageSb.append(", 期望mode："+exp_mode+" 实际mode："+act_mode); + StringBuffer messageSb = new StringBuffer(); + messageSb.append("任务异常,phase" + agvStatus.getPhase()); + if (expectValue.get("ept_action") != null) { + messageSb.append(", 期望action：" + exp_action + " 实际action：" + act_action); } - if(expectValue.get("ept_error")!=null){ - messageSb.append(", 期望error："+exp_move+" 实际error："+act_move); + if (expectValue.get("ept_mode") != null) { + messageSb.append(", 期望mode：" + exp_mode + " 实际mode：" + act_mode); } - if(expectValue.get("ept_move")!=null){ - messageSb.append(", 期望move："+exp_error+" 实际move："+act_error); + if (expectValue.get("ept_error") != null) { + messageSb.append(", 期望error：" + exp_move + " 实际error：" + act_move); + } + if (expectValue.get("ept_move") != null) { + messageSb.append(", 期望move：" + exp_error + " 实际move：" + act_error); } @@ -338,6 +356,8 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic RangingStationsDeviceDriver rangingStationsDeviceDriver; //废箔称重位 WasteFoilWeighingStationDriver wasteFoilWeighingStationDriver; + //普通光点对接点 + OptoeleDockingStationDeviceDriver optoeleDockingStationDeviceDriver; // 更新AGV状态信息到TwoFloorAgvStatusService TwoFloorAgvStatus agvStatus = updateAgvStatusToService(arr, carno, phase, ikey, agvaddr, inst, task); @@ -459,17 +479,17 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic } else { message = "设备号:" + device_code + "光电信号move:" + standardInspectSiteDeviceDriver.getMove() + ",动作信号action:" + standardInspectSiteDeviceDriver.getAction() + "报警信号:" + standardInspectSiteDeviceDriver.getError() + ",指令号:" + ikey + "不满足取货条件"; // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_action",1); - eptMap.put("ept_mode",null); - eptMap.put("ept_error",0); - eptMap.put("ept_move",1); + Map eptMap = new HashMap<>(); + eptMap.put("ept_action", 1); + eptMap.put("ept_mode", null); + eptMap.put("ept_error", 0); + eptMap.put("ept_move", 1); Map actMap = new HashMap<>(); - actMap.put("act_action",standardInspectSiteDeviceDriver.getAction()); - actMap.put("act_mode",standardInspectSiteDeviceDriver.getMode()); - actMap.put("act_error",standardInspectSiteDeviceDriver.getError()); - actMap.put("act_move",standardInspectSiteDeviceDriver.getMove()); - recordTaskStuckReason(carno,agvStatus, device_code, "standardInspectSiteDeviceDriver", message,eptMap,actMap); + actMap.put("act_action", standardInspectSiteDeviceDriver.getAction()); + actMap.put("act_mode", standardInspectSiteDeviceDriver.getMode()); + actMap.put("act_error", standardInspectSiteDeviceDriver.getError()); + actMap.put("act_move", standardInspectSiteDeviceDriver.getMove()); + recordTaskStuckReason(carno, agvStatus, device_code, "standardInspectSiteDeviceDriver", message, eptMap, actMap); LuceneLogDto logDto = LuceneLogDto.builder() .device_code(this.getDeviceCode()) .content(message) @@ -502,17 +522,17 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_action",1); - eptMap.put("ept_mode",2); - eptMap.put("ept_error",null); - eptMap.put("ept_move",null); + Map eptMap = new HashMap<>(); + eptMap.put("ept_action", 1); + eptMap.put("ept_mode", 2); + eptMap.put("ept_error", null); + eptMap.put("ept_move", null); Map actMap = new HashMap<>(); - actMap.put("act_action",manipulatorAgvStationDeviceDriver.getAction()); - actMap.put("act_mode",manipulatorAgvStationDeviceDriver.getMode()); - // actMap.put("act_error",manipulatorAgvStationDeviceDriver.getError()); - // actMap.put("act_move",manipulatorAgvStationDeviceDriver.getMove()); - recordTaskStuckReason(carno,agvStatus, device_code, "manipulatorAgvStationDeviceDriver", message,eptMap,actMap); + actMap.put("act_action", manipulatorAgvStationDeviceDriver.getAction()); + actMap.put("act_mode", manipulatorAgvStationDeviceDriver.getMode()); + // actMap.put("act_error",manipulatorAgvStationDeviceDriver.getError()); + // actMap.put("act_move",manipulatorAgvStationDeviceDriver.getMove()); + recordTaskStuckReason(carno, agvStatus, device_code, "manipulatorAgvStationDeviceDriver", message, eptMap, actMap); } } else if (device.getDeviceDriver() instanceof HongXiangStationDeviceDriver) { hongXiangStationDeviceDriver = (HongXiangStationDeviceDriver) device.getDeviceDriver(); @@ -539,17 +559,17 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - // eptMap.put("ept_action",1); - // eptMap.put("ept_mode",null); - // eptMap.put("ept_error",0); - eptMap.put("ept_move",1); + Map eptMap = new HashMap<>(); + // eptMap.put("ept_action",1); + // eptMap.put("ept_mode",null); + // eptMap.put("ept_error",0); + eptMap.put("ept_move", 1); Map actMap = new HashMap<>(); - // actMap.put("act_action",hongXiangStationDeviceDriver.getAction()); - // actMap.put("act_mode",hongXiangStationDeviceDriver.getMode()); - // actMap.put("act_error",hongXiangStationDeviceDriver.getError()); - actMap.put("act_move",hongXiangStationDeviceDriver.getMove()); - recordTaskStuckReason(carno,agvStatus, device_code, "hongXiangStationDeviceDriver", message,eptMap,actMap); + // actMap.put("act_action",hongXiangStationDeviceDriver.getAction()); + // actMap.put("act_mode",hongXiangStationDeviceDriver.getMode()); + // actMap.put("act_error",hongXiangStationDeviceDriver.getError()); + actMap.put("act_move", hongXiangStationDeviceDriver.getMove()); + recordTaskStuckReason(carno, agvStatus, device_code, "hongXiangStationDeviceDriver", message, eptMap, actMap); } } else if (device.getDeviceDriver() instanceof PaperTubePickSiteDeviceDriver) { paperTubePickSiteDeviceDriver = (PaperTubePickSiteDeviceDriver) device.getDeviceDriver(); @@ -578,17 +598,17 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_action",1); - eptMap.put("ept_mode",2); - eptMap.put("ept_error",0); - eptMap.put("ept_move",null); + Map eptMap = new HashMap<>(); + eptMap.put("ept_action", 1); + eptMap.put("ept_mode", 2); + eptMap.put("ept_error", 0); + eptMap.put("ept_move", null); Map actMap = new HashMap<>(); - actMap.put("act_action",paperTubePickSiteDeviceDriver.getAction()); - actMap.put("act_mode",paperTubePickSiteDeviceDriver.getMode()); - actMap.put("act_error",paperTubePickSiteDeviceDriver.getError()); - actMap.put("act_move",paperTubePickSiteDeviceDriver.getMove()); - recordTaskStuckReason(carno,agvStatus, device_code, "paperTubePickSiteDeviceDriver", message,eptMap,actMap); + actMap.put("act_action", paperTubePickSiteDeviceDriver.getAction()); + actMap.put("act_mode", paperTubePickSiteDeviceDriver.getMode()); + actMap.put("act_error", paperTubePickSiteDeviceDriver.getError()); + actMap.put("act_move", paperTubePickSiteDeviceDriver.getMove()); + recordTaskStuckReason(carno, agvStatus, device_code, "paperTubePickSiteDeviceDriver", message, eptMap, actMap); } }/* else if (device.getDeviceDriver() instanceof RangingStationsDeviceDriver) { rangingStationsDeviceDriver = (RangingStationsDeviceDriver) device.getDeviceDriver(); @@ -666,6 +686,17 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic } catch (Exception e) { e.printStackTrace(); } + } else if (device.getDeviceDriver() instanceof OptoeleDockingStationDeviceDriver) { + optoeleDockingStationDeviceDriver = (OptoeleDockingStationDeviceDriver) device.getDeviceDriver(); + if (optoeleDockingStationDeviceDriver.getMode() > 0 && optoeleDockingStationDeviceDriver.getMove() > 0) { + data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); + LuceneLogDto logDto = LuceneLogDto.builder() + .device_code(this.getDeviceCode()) + .content("agvphase:" + phase + "反馈:" + data) + .build(); + logDto.setLog_level(4); + luceneExecuteLogService.deviceExecuteLog(logDto); + } } else { message = "设备号:" + device_code + "光电信号:" + wasteFoilWeighingStationDriver.getMove() + ",动作信号:" + wasteFoilWeighingStationDriver.getAction() + "报警信号:" + wasteFoilWeighingStationDriver.getError() + ",指令号:" + ikey + "不满足取货条件"; LuceneLogDto logDto = LuceneLogDto.builder() @@ -676,17 +707,17 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_action",1); - eptMap.put("ept_mode",2); - eptMap.put("ept_error",0); - eptMap.put("ept_move",1); + Map eptMap = new HashMap<>(); + eptMap.put("ept_action", 1); + eptMap.put("ept_mode", 2); + eptMap.put("ept_error", 0); + eptMap.put("ept_move", 1); Map actMap = new HashMap<>(); - actMap.put("act_action",wasteFoilWeighingStationDriver.getAction()); - actMap.put("act_mode",wasteFoilWeighingStationDriver.getMode()); - actMap.put("act_error",wasteFoilWeighingStationDriver.getError()); - actMap.put("act_move",wasteFoilWeighingStationDriver.getMove()); - recordTaskStuckReason(carno,agvStatus, device_code, "wasteFoilWeighingStationDriver", message,eptMap,actMap); + actMap.put("act_action", wasteFoilWeighingStationDriver.getAction()); + actMap.put("act_mode", wasteFoilWeighingStationDriver.getMode()); + actMap.put("act_error", wasteFoilWeighingStationDriver.getError()); + actMap.put("act_move", wasteFoilWeighingStationDriver.getMove()); + recordTaskStuckReason(carno, agvStatus, device_code, "wasteFoilWeighingStationDriver", message, eptMap, actMap); } } else { @@ -817,13 +848,13 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic agvStatusService.clearAgvError(carno); } else { // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_action",0); - eptMap.put("ept_mode",2); + Map eptMap = new HashMap<>(); + eptMap.put("ept_action", 0); + eptMap.put("ept_mode", 2); Map actMap = new HashMap<>(); - actMap.put("act_action",manipulatorAgvStationDeviceDriver.getAction()); - actMap.put("act_mode",manipulatorAgvStationDeviceDriver.getMode()); - recordTaskStuckReason(carno,agvStatus, device_code, "manipulatorAgvStationDeviceDriver", message,eptMap,actMap); + actMap.put("act_action", manipulatorAgvStationDeviceDriver.getAction()); + actMap.put("act_mode", manipulatorAgvStationDeviceDriver.getMode()); + recordTaskStuckReason(carno, agvStatus, device_code, "manipulatorAgvStationDeviceDriver", message, eptMap, actMap); LuceneLogDto logDto = LuceneLogDto.builder() .device_code(manipulatorAgvStationDeviceDriver.getDevice_code()) .content("未给agv离开信号原因是：" + manipulatorAgvStationDeviceDriver.getDevice_code() + "动作信号不为0,当前的指令号为：" + inst.getInstruction_code()) @@ -857,11 +888,11 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_move",1); + Map eptMap = new HashMap<>(); + eptMap.put("ept_move", 1); Map actMap = new HashMap<>(); - actMap.put("act_move",hongXiangStationDeviceDriver.getMove()); - recordTaskStuckReason(carno,agvStatus, device_code, "hongXiangStationDeviceDriver", message,eptMap,actMap); + actMap.put("act_move", hongXiangStationDeviceDriver.getMove()); + recordTaskStuckReason(carno, agvStatus, device_code, "hongXiangStationDeviceDriver", message, eptMap, actMap); } } else if (device.getDeviceDriver() instanceof PaperTubePickSiteDeviceDriver) { @@ -889,17 +920,17 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_action",0); - eptMap.put("ept_mode",2); - eptMap.put("ept_error",0); - eptMap.put("ept_move",null); + Map eptMap = new HashMap<>(); + eptMap.put("ept_action", 0); + eptMap.put("ept_mode", 2); + eptMap.put("ept_error", 0); + eptMap.put("ept_move", null); Map actMap = new HashMap<>(); - actMap.put("act_action",paperTubePickSiteDeviceDriver.getAction()); - actMap.put("act_mode",paperTubePickSiteDeviceDriver.getMode()); - actMap.put("act_error",paperTubePickSiteDeviceDriver.getError()); - actMap.put("act_move",paperTubePickSiteDeviceDriver.getMove()); - recordTaskStuckReason(carno,agvStatus, device_code, "paperTubePickSiteDeviceDriver", message,eptMap,actMap); + actMap.put("act_action", paperTubePickSiteDeviceDriver.getAction()); + actMap.put("act_mode", paperTubePickSiteDeviceDriver.getMode()); + actMap.put("act_error", paperTubePickSiteDeviceDriver.getError()); + actMap.put("act_move", paperTubePickSiteDeviceDriver.getMove()); + recordTaskStuckReason(carno, agvStatus, device_code, "paperTubePickSiteDeviceDriver", message, eptMap, actMap); } } else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { @@ -928,13 +959,13 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_error",0); - eptMap.put("ept_move",-1); + Map eptMap = new HashMap<>(); + eptMap.put("ept_error", 0); + eptMap.put("ept_move", -1); Map actMap = new HashMap<>(); - actMap.put("act_error",standardInspectSiteDeviceDriver.getError()); - actMap.put("act_move",standardInspectSiteDeviceDriver.getMove()); - recordTaskStuckReason(carno,agvStatus, device_code, "standardInspectSiteDeviceDriver", message,eptMap,actMap); + actMap.put("act_error", standardInspectSiteDeviceDriver.getError()); + actMap.put("act_move", standardInspectSiteDeviceDriver.getMove()); + recordTaskStuckReason(carno, agvStatus, device_code, "standardInspectSiteDeviceDriver", message, eptMap, actMap); } } else if (device.getDeviceDriver() instanceof WasteFoilWeighingStationDriver) { wasteFoilWeighingStationDriver = (WasteFoilWeighingStationDriver) device.getDeviceDriver(); @@ -964,17 +995,17 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_action",1); - eptMap.put("ept_mode",2); - eptMap.put("ept_error",0); - eptMap.put("ept_move",0); + Map eptMap = new HashMap<>(); + eptMap.put("ept_action", 1); + eptMap.put("ept_mode", 2); + eptMap.put("ept_error", 0); + eptMap.put("ept_move", 0); Map actMap = new HashMap<>(); - actMap.put("act_action",wasteFoilWeighingStationDriver.getAction()); - actMap.put("act_mode",wasteFoilWeighingStationDriver.getMode()); - actMap.put("act_error",wasteFoilWeighingStationDriver.getError()); - actMap.put("act_move",wasteFoilWeighingStationDriver.getMove()); - recordTaskStuckReason(carno,agvStatus, device_code, "wasteFoilWeighingStationDriver", message,eptMap,actMap); + actMap.put("act_action", wasteFoilWeighingStationDriver.getAction()); + actMap.put("act_mode", wasteFoilWeighingStationDriver.getMode()); + actMap.put("act_error", wasteFoilWeighingStationDriver.getError()); + actMap.put("act_move", wasteFoilWeighingStationDriver.getMove()); + recordTaskStuckReason(carno, agvStatus, device_code, "wasteFoilWeighingStationDriver", message, eptMap, actMap); } } else { data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); @@ -1101,13 +1132,13 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_mode",2); - eptMap.put("ept_action",1); + Map eptMap = new HashMap<>(); + eptMap.put("ept_mode", 2); + eptMap.put("ept_action", 1); Map actMap = new HashMap<>(); - actMap.put("act_mode",manipulatorAgvStationDeviceDriver.getMode()); - actMap.put("act_action",manipulatorAgvStationDeviceDriver.getAction()); - recordTaskStuckReason(carno,agvStatus, device_code, "manipulatorAgvStationDeviceDriver", message,eptMap,actMap); + actMap.put("act_mode", manipulatorAgvStationDeviceDriver.getMode()); + actMap.put("act_action", manipulatorAgvStationDeviceDriver.getAction()); + recordTaskStuckReason(carno, agvStatus, device_code, "manipulatorAgvStationDeviceDriver", message, eptMap, actMap); } } else if (device.getDeviceDriver() instanceof PaperTubePickSiteDeviceDriver) { paperTubePickSiteDeviceDriver = (PaperTubePickSiteDeviceDriver) device.getDeviceDriver(); @@ -1136,15 +1167,15 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_error",0); - eptMap.put("ept_mode",2); - eptMap.put("ept_action",1); + Map eptMap = new HashMap<>(); + eptMap.put("ept_error", 0); + eptMap.put("ept_mode", 2); + eptMap.put("ept_action", 1); Map actMap = new HashMap<>(); - actMap.put("act_error",paperTubePickSiteDeviceDriver.getError()); - actMap.put("act_mode",paperTubePickSiteDeviceDriver.getMode()); - actMap.put("act_action",paperTubePickSiteDeviceDriver.getAction()); - recordTaskStuckReason(carno,agvStatus, device_code, "paperTubePickSiteDeviceDriver", message,eptMap,actMap); + actMap.put("act_error", paperTubePickSiteDeviceDriver.getError()); + actMap.put("act_mode", paperTubePickSiteDeviceDriver.getMode()); + actMap.put("act_action", paperTubePickSiteDeviceDriver.getAction()); + recordTaskStuckReason(carno, agvStatus, device_code, "paperTubePickSiteDeviceDriver", message, eptMap, actMap); } } else if (device.getDeviceDriver() instanceof HongXiangStationDeviceDriver) { hongXiangStationDeviceDriver = (HongXiangStationDeviceDriver) device.getDeviceDriver(); @@ -1172,12 +1203,12 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_move",1); + Map eptMap = new HashMap<>(); + eptMap.put("ept_move", 1); Map actMap = new HashMap<>(); - actMap.put("act_move",hongXiangStationDeviceDriver.getError()); + actMap.put("act_move", hongXiangStationDeviceDriver.getError()); - recordTaskStuckReason(carno,agvStatus, device_code, "paperTubePickSiteDeviceDriver", message,eptMap,actMap); + recordTaskStuckReason(carno, agvStatus, device_code, "paperTubePickSiteDeviceDriver", message, eptMap, actMap); } } else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver(); @@ -1206,20 +1237,32 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_action",1); - eptMap.put("ept_mode",null); - eptMap.put("ept_error",0); - eptMap.put("ept_move",1); + Map eptMap = new HashMap<>(); + eptMap.put("ept_action", 1); + eptMap.put("ept_mode", null); + eptMap.put("ept_error", 0); + eptMap.put("ept_move", 1); Map actMap = new HashMap<>(); - actMap.put("act_action",standardInspectSiteDeviceDriver.getAction()); - actMap.put("act_mode",standardInspectSiteDeviceDriver.getMode()); - actMap.put("act_error",standardInspectSiteDeviceDriver.getError()); - actMap.put("act_move",standardInspectSiteDeviceDriver.getMove()); - recordTaskStuckReason(carno,agvStatus, device_code, "standardInspectSiteDeviceDriver", message,eptMap,actMap); + actMap.put("act_action", standardInspectSiteDeviceDriver.getAction()); + actMap.put("act_mode", standardInspectSiteDeviceDriver.getMode()); + actMap.put("act_error", standardInspectSiteDeviceDriver.getError()); + actMap.put("act_move", standardInspectSiteDeviceDriver.getMove()); + recordTaskStuckReason(carno, agvStatus, device_code, "standardInspectSiteDeviceDriver", message, eptMap, actMap); } - }/* else if (device.getDeviceDriver() instanceof RangingStationsDeviceDriver) { + } else if (device.getDeviceDriver() instanceof OptoeleDockingStationDeviceDriver) { + optoeleDockingStationDeviceDriver = (OptoeleDockingStationDeviceDriver) device.getDeviceDriver(); + if (optoeleDockingStationDeviceDriver.getMode() > 0 && optoeleDockingStationDeviceDriver.getMove() > 0) { + data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); + LuceneLogDto logDto = LuceneLogDto.builder() + .device_code(this.getDeviceCode()) + .content("agvphase:" + phase + "反馈:" + data) + .build(); + logDto.setLog_level(4); + luceneExecuteLogService.deviceExecuteLog(logDto); + } + } + /* else if (device.getDeviceDriver() instanceof RangingStationsDeviceDriver) { rangingStationsDeviceDriver = (RangingStationsDeviceDriver) device.getDeviceDriver(); ISysParamService paramService = SpringContextHolder.getBean(ISysParamService.class); String device_code1 = device.getDevice_code(); @@ -1270,7 +1313,8 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic } else { log.info("设备{},偏移数据出错导致未反馈{},指令号{}", device_code, rangingStationsDeviceDriver.getLength1() + "," + rangingStationsDeviceDriver.getLength2(), ikey); } - }*/ else { + }*/ + else { data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) @@ -1351,17 +1395,18 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_action",1); - eptMap.put("ept_mode",2); - eptMap.put("ept_error",null); - eptMap.put("ept_move",null); + Map eptMap = new HashMap<>(); + eptMap.put("ept_action", 1); + eptMap.put("ept_mode", 2); + eptMap.put("ept_error", null); + eptMap.put("ept_move", null); Map actMap = new HashMap<>(); - actMap.put("act_action",manipulatorAgvStationDeviceDriver.getAction()); - actMap.put("act_mode",manipulatorAgvStationDeviceDriver.getMode()); + actMap.put("act_action", manipulatorAgvStationDeviceDriver.getAction()); + actMap.put("act_mode", manipulatorAgvStationDeviceDriver.getMode()); // actMap.put("act_error",manipulatorAgvStationDeviceDriver.getError()); // actMap.put("act_move",manipulatorAgvStationDeviceDriver.getMove()); - recordTaskStuckReason(carno,agvStatus, device_code, "manipulatorAgvStationDeviceDriver", message,eptMap,actMap); } + recordTaskStuckReason(carno, agvStatus, device_code, "manipulatorAgvStationDeviceDriver", message, eptMap, actMap); + } } } else if (ObjectUtil.isNotEmpty(start_device_code) && StrUtil.equals(device_code, next_device_code)) { if (device.getDeviceDriver() instanceof ManipulatorAgvStationDeviceDriver) { @@ -1391,17 +1436,18 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_action",1); - eptMap.put("ept_mode",2); - eptMap.put("ept_error",null); - eptMap.put("ept_move",null); + Map eptMap = new HashMap<>(); + eptMap.put("ept_action", 1); + eptMap.put("ept_mode", 2); + eptMap.put("ept_error", null); + eptMap.put("ept_move", null); Map actMap = new HashMap<>(); - actMap.put("act_action",manipulatorAgvStationDeviceDriver.getAction()); - actMap.put("act_mode",manipulatorAgvStationDeviceDriver.getMode()); + actMap.put("act_action", manipulatorAgvStationDeviceDriver.getAction()); + actMap.put("act_mode", manipulatorAgvStationDeviceDriver.getMode()); // actMap.put("act_error",manipulatorAgvStationDeviceDriver.getError()); // actMap.put("act_move",manipulatorAgvStationDeviceDriver.getMove()); - recordTaskStuckReason(carno,agvStatus, device_code, "manipulatorAgvStationDeviceDriver", message,eptMap,actMap); } + recordTaskStuckReason(carno, agvStatus, device_code, "manipulatorAgvStationDeviceDriver", message, eptMap, actMap); + } } } else if (ObjectUtil.isNotEmpty(start_device_code) && StrUtil.equals(device_code, start_device_code2)) { if (device.getDeviceDriver() instanceof ManipulatorAgvStationDeviceDriver) { @@ -1431,17 +1477,18 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_action",1); - eptMap.put("ept_mode",2); - eptMap.put("ept_error",null); - eptMap.put("ept_move",null); + Map eptMap = new HashMap<>(); + eptMap.put("ept_action", 1); + eptMap.put("ept_mode", 2); + eptMap.put("ept_error", null); + eptMap.put("ept_move", null); Map actMap = new HashMap<>(); - actMap.put("act_action",manipulatorAgvStationDeviceDriver.getAction()); - actMap.put("act_mode",manipulatorAgvStationDeviceDriver.getMode()); + actMap.put("act_action", manipulatorAgvStationDeviceDriver.getAction()); + actMap.put("act_mode", manipulatorAgvStationDeviceDriver.getMode()); // actMap.put("act_error",manipulatorAgvStationDeviceDriver.getError()); // actMap.put("act_move",manipulatorAgvStationDeviceDriver.getMove()); - recordTaskStuckReason(carno,agvStatus, device_code, "manipulatorAgvStationDeviceDriver", message,eptMap,actMap); } + recordTaskStuckReason(carno, agvStatus, device_code, "manipulatorAgvStationDeviceDriver", message, eptMap, actMap); + } } } else if (ObjectUtil.isNotEmpty(start_device_code) && StrUtil.equals(device_code, next_device_code2)) { if (device.getDeviceDriver() instanceof ManipulatorAgvStationDeviceDriver) { @@ -1471,17 +1518,18 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_action",1); - eptMap.put("ept_mode",2); - eptMap.put("ept_error",null); - eptMap.put("ept_move",null); + Map eptMap = new HashMap<>(); + eptMap.put("ept_action", 1); + eptMap.put("ept_mode", 2); + eptMap.put("ept_error", null); + eptMap.put("ept_move", null); Map actMap = new HashMap<>(); - actMap.put("act_action",manipulatorAgvStationDeviceDriver.getAction()); - actMap.put("act_mode",manipulatorAgvStationDeviceDriver.getMode()); + actMap.put("act_action", manipulatorAgvStationDeviceDriver.getAction()); + actMap.put("act_mode", manipulatorAgvStationDeviceDriver.getMode()); // actMap.put("act_error",manipulatorAgvStationDeviceDriver.getError()); // actMap.put("act_move",manipulatorAgvStationDeviceDriver.getMove()); - recordTaskStuckReason(carno,agvStatus, device_code, "manipulatorAgvStationDeviceDriver", message,eptMap,actMap); } + recordTaskStuckReason(carno, agvStatus, device_code, "manipulatorAgvStationDeviceDriver", message, eptMap, actMap); + } } } // else { @@ -1599,11 +1647,11 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_move",0); + Map eptMap = new HashMap<>(); + eptMap.put("ept_move", 0); Map actMap = new HashMap<>(); - actMap.put("act_move",hongXiangStationDeviceDriver.getMove()); - recordTaskStuckReason(carno,agvStatus, device_code, "hongXiangStationDeviceDriver", message,eptMap,actMap); + actMap.put("act_move", hongXiangStationDeviceDriver.getMove()); + recordTaskStuckReason(carno, agvStatus, device_code, "hongXiangStationDeviceDriver", message, eptMap, actMap); } } else if (device.getDeviceDriver() instanceof ManipulatorAgvStationDeviceDriver) { manipulatorAgvStationDeviceDriver = (ManipulatorAgvStationDeviceDriver) device.getDeviceDriver(); @@ -1643,17 +1691,18 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_action",0); - eptMap.put("ept_mode",2); - eptMap.put("ept_error",null); - eptMap.put("ept_move",null); + Map eptMap = new HashMap<>(); + eptMap.put("ept_action", 0); + eptMap.put("ept_mode", 2); + eptMap.put("ept_error", null); + eptMap.put("ept_move", null); Map actMap = new HashMap<>(); - actMap.put("act_action",manipulatorAgvStationDeviceDriver.getAction()); - actMap.put("act_mode",manipulatorAgvStationDeviceDriver.getMode()); + actMap.put("act_action", manipulatorAgvStationDeviceDriver.getAction()); + actMap.put("act_mode", manipulatorAgvStationDeviceDriver.getMode()); // actMap.put("act_error",manipulatorAgvStationDeviceDriver.getError()); // actMap.put("act_move",manipulatorAgvStationDeviceDriver.getMove()); - recordTaskStuckReason(carno,agvStatus, device_code, "manipulatorAgvStationDeviceDriver", message,eptMap,actMap); } + recordTaskStuckReason(carno, agvStatus, device_code, "manipulatorAgvStationDeviceDriver", message, eptMap, actMap); + } } else if (device.getDeviceDriver() instanceof PaperTubePickSiteDeviceDriver) { paperTubePickSiteDeviceDriver = (PaperTubePickSiteDeviceDriver) device.getDeviceDriver(); try { @@ -1681,17 +1730,17 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_action",1); - eptMap.put("ept_mode",2); - eptMap.put("ept_error",0); - eptMap.put("ept_move",null); + Map eptMap = new HashMap<>(); + eptMap.put("ept_action", 1); + eptMap.put("ept_mode", 2); + eptMap.put("ept_error", 0); + eptMap.put("ept_move", null); Map actMap = new HashMap<>(); - actMap.put("act_action",paperTubePickSiteDeviceDriver.getAction()); - actMap.put("act_mode",paperTubePickSiteDeviceDriver.getMode()); - actMap.put("act_error",paperTubePickSiteDeviceDriver.getError()); - actMap.put("act_move",paperTubePickSiteDeviceDriver.getMove()); - recordTaskStuckReason(carno,agvStatus, device_code, "paperTubePickSiteDeviceDriver", message,eptMap,actMap); + actMap.put("act_action", paperTubePickSiteDeviceDriver.getAction()); + actMap.put("act_mode", paperTubePickSiteDeviceDriver.getMode()); + actMap.put("act_error", paperTubePickSiteDeviceDriver.getError()); + actMap.put("act_move", paperTubePickSiteDeviceDriver.getMove()); + recordTaskStuckReason(carno, agvStatus, device_code, "paperTubePickSiteDeviceDriver", message, eptMap, actMap); } } else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { @@ -1721,17 +1770,17 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_action",1); - eptMap.put("ept_mode",null); - eptMap.put("ept_error",0); - eptMap.put("ept_move",1); + Map eptMap = new HashMap<>(); + eptMap.put("ept_action", 1); + eptMap.put("ept_mode", null); + eptMap.put("ept_error", 0); + eptMap.put("ept_move", 1); Map actMap = new HashMap<>(); - actMap.put("act_action",standardInspectSiteDeviceDriver.getAction()); - actMap.put("act_mode",standardInspectSiteDeviceDriver.getMode()); - actMap.put("act_error",standardInspectSiteDeviceDriver.getError()); - actMap.put("act_move",standardInspectSiteDeviceDriver.getMove()); - recordTaskStuckReason(carno,agvStatus, device_code, "standardInspectSiteDeviceDriver", message,eptMap,actMap); + actMap.put("act_action", standardInspectSiteDeviceDriver.getAction()); + actMap.put("act_mode", standardInspectSiteDeviceDriver.getMode()); + actMap.put("act_error", standardInspectSiteDeviceDriver.getError()); + actMap.put("act_move", standardInspectSiteDeviceDriver.getMove()); + recordTaskStuckReason(carno, agvStatus, device_code, "standardInspectSiteDeviceDriver", message, eptMap, actMap); } } else { data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); @@ -1832,6 +1881,17 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic standardOrdinarySiteDeviceDriver.setIndex(index); standardOrdinarySiteDeviceDriver.setInst(inst); + } else if (device.getDeviceDriver() instanceof OptoeleDockingStationDeviceDriver) { + optoeleDockingStationDeviceDriver = (OptoeleDockingStationDeviceDriver) device.getDeviceDriver(); + if (optoeleDockingStationDeviceDriver.getMode() > 0 && optoeleDockingStationDeviceDriver.getMove() == 0) { + data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); + LuceneLogDto logDto = LuceneLogDto.builder() + .device_code(this.getDeviceCode()) + .content("agvphase:" + phase + "反馈:" + data) + .build(); + logDto.setLog_level(4); + luceneExecuteLogService.deviceExecuteLog(logDto); + } } else if (device.getDeviceDriver() instanceof PaperTubePickSiteDeviceDriver) { paperTubePickSiteDeviceDriver = (PaperTubePickSiteDeviceDriver) device.getDeviceDriver(); try { @@ -1860,17 +1920,17 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_action",1); - eptMap.put("ept_mode",2); - eptMap.put("ept_error",0); - eptMap.put("ept_move",null); + Map eptMap = new HashMap<>(); + eptMap.put("ept_action", 1); + eptMap.put("ept_mode", 2); + eptMap.put("ept_error", 0); + eptMap.put("ept_move", null); Map actMap = new HashMap<>(); - actMap.put("act_action",paperTubePickSiteDeviceDriver.getAction()); - actMap.put("act_mode",paperTubePickSiteDeviceDriver.getMode()); - actMap.put("act_error",paperTubePickSiteDeviceDriver.getError()); - actMap.put("act_move",paperTubePickSiteDeviceDriver.getMove()); - recordTaskStuckReason(carno,agvStatus, device_code, "paperTubePickSiteDeviceDriver", message,eptMap,actMap); + actMap.put("act_action", paperTubePickSiteDeviceDriver.getAction()); + actMap.put("act_mode", paperTubePickSiteDeviceDriver.getMode()); + actMap.put("act_error", paperTubePickSiteDeviceDriver.getError()); + actMap.put("act_move", paperTubePickSiteDeviceDriver.getMove()); + recordTaskStuckReason(carno, agvStatus, device_code, "paperTubePickSiteDeviceDriver", message, eptMap, actMap); } } else if (device.getDeviceDriver() instanceof ManipulatorAgvStationDeviceDriver) { manipulatorAgvStationDeviceDriver = (ManipulatorAgvStationDeviceDriver) device.getDeviceDriver(); @@ -1900,17 +1960,18 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_action",1); - eptMap.put("ept_mode",2); - eptMap.put("ept_error",null); - eptMap.put("ept_move",null); + Map eptMap = new HashMap<>(); + eptMap.put("ept_action", 1); + eptMap.put("ept_mode", 2); + eptMap.put("ept_error", null); + eptMap.put("ept_move", null); Map actMap = new HashMap<>(); - actMap.put("act_action",manipulatorAgvStationDeviceDriver.getAction()); - actMap.put("act_mode",manipulatorAgvStationDeviceDriver.getMode()); + actMap.put("act_action", manipulatorAgvStationDeviceDriver.getAction()); + actMap.put("act_mode", manipulatorAgvStationDeviceDriver.getMode()); // actMap.put("act_error",manipulatorAgvStationDeviceDriver.getError()); // actMap.put("act_move",manipulatorAgvStationDeviceDriver.getMove()); - recordTaskStuckReason(carno,agvStatus, device_code, "manipulatorAgvStationDeviceDriver", message,eptMap,actMap); } + recordTaskStuckReason(carno, agvStatus, device_code, "manipulatorAgvStationDeviceDriver", message, eptMap, actMap); + } } else if (device.getDeviceDriver() instanceof HongXiangStationDeviceDriver) { hongXiangStationDeviceDriver = (HongXiangStationDeviceDriver) device.getDeviceDriver(); try { @@ -1939,11 +2000,11 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_move",0); + Map eptMap = new HashMap<>(); + eptMap.put("ept_move", 0); Map actMap = new HashMap<>(); - actMap.put("act_move",hongXiangStationDeviceDriver.getMove()); - recordTaskStuckReason(carno,agvStatus, device_code, "hongXiangStationDeviceDriver", message,eptMap,actMap); + actMap.put("act_move", hongXiangStationDeviceDriver.getMove()); + recordTaskStuckReason(carno, agvStatus, device_code, "hongXiangStationDeviceDriver", message, eptMap, actMap); } } else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver(); @@ -1973,17 +2034,17 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_action",1); - eptMap.put("ept_mode",null); - eptMap.put("ept_error",0); - eptMap.put("ept_move",0); + Map eptMap = new HashMap<>(); + eptMap.put("ept_action", 1); + eptMap.put("ept_mode", null); + eptMap.put("ept_error", 0); + eptMap.put("ept_move", 0); Map actMap = new HashMap<>(); - actMap.put("act_action",standardInspectSiteDeviceDriver.getAction()); - actMap.put("act_mode",standardInspectSiteDeviceDriver.getMode()); - actMap.put("act_error",standardInspectSiteDeviceDriver.getError()); - actMap.put("act_move",standardInspectSiteDeviceDriver.getMove()); - recordTaskStuckReason(carno,agvStatus, device_code, "standardInspectSiteDeviceDriver", message,eptMap,actMap); + actMap.put("act_action", standardInspectSiteDeviceDriver.getAction()); + actMap.put("act_mode", standardInspectSiteDeviceDriver.getMode()); + actMap.put("act_error", standardInspectSiteDeviceDriver.getError()); + actMap.put("act_move", standardInspectSiteDeviceDriver.getMove()); + recordTaskStuckReason(carno, agvStatus, device_code, "standardInspectSiteDeviceDriver", message, eptMap, actMap); } }/* else if (device.getDeviceDriver() instanceof RangingStationsDeviceDriver) { @@ -2068,17 +2129,17 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_action",1); - eptMap.put("ept_mode",2); - eptMap.put("ept_error",0); - eptMap.put("ept_move",0); + Map eptMap = new HashMap<>(); + eptMap.put("ept_action", 1); + eptMap.put("ept_mode", 2); + eptMap.put("ept_error", 0); + eptMap.put("ept_move", 0); Map actMap = new HashMap<>(); - actMap.put("act_action",wasteFoilWeighingStationDriver.getAction()); - actMap.put("act_mode",wasteFoilWeighingStationDriver.getMode()); - actMap.put("act_error",wasteFoilWeighingStationDriver.getError()); - actMap.put("act_move",wasteFoilWeighingStationDriver.getMove()); - recordTaskStuckReason(carno,agvStatus, device_code, "wasteFoilWeighingStationDriver", message,eptMap,actMap); + actMap.put("act_action", wasteFoilWeighingStationDriver.getAction()); + actMap.put("act_mode", wasteFoilWeighingStationDriver.getMode()); + actMap.put("act_error", wasteFoilWeighingStationDriver.getError()); + actMap.put("act_move", wasteFoilWeighingStationDriver.getMove()); + recordTaskStuckReason(carno, agvStatus, device_code, "wasteFoilWeighingStationDriver", message, eptMap, actMap); } } else { data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); @@ -2179,17 +2240,18 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_action",0); - eptMap.put("ept_mode",2); - eptMap.put("ept_error",null); - eptMap.put("ept_move",null); + Map eptMap = new HashMap<>(); + eptMap.put("ept_action", 0); + eptMap.put("ept_mode", 2); + eptMap.put("ept_error", null); + eptMap.put("ept_move", null); Map actMap = new HashMap<>(); - actMap.put("act_action",manipulatorAgvStationDeviceDriver.getAction()); - actMap.put("act_mode",manipulatorAgvStationDeviceDriver.getMode()); + actMap.put("act_action", manipulatorAgvStationDeviceDriver.getAction()); + actMap.put("act_mode", manipulatorAgvStationDeviceDriver.getMode()); // actMap.put("act_error",manipulatorAgvStationDeviceDriver.getError()); // actMap.put("act_move",manipulatorAgvStationDeviceDriver.getMove()); - recordTaskStuckReason(carno,agvStatus, device_code, "manipulatorAgvStationDeviceDriver", message,eptMap,actMap); } + recordTaskStuckReason(carno, agvStatus, device_code, "manipulatorAgvStationDeviceDriver", message, eptMap, actMap); + } } else if (device.getDeviceDriver() instanceof HongXiangStationDeviceDriver) { hongXiangStationDeviceDriver = (HongXiangStationDeviceDriver) device.getDeviceDriver(); try { @@ -2218,11 +2280,11 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_move",1); + Map eptMap = new HashMap<>(); + eptMap.put("ept_move", 1); Map actMap = new HashMap<>(); - actMap.put("act_move",hongXiangStationDeviceDriver.getMove()); - recordTaskStuckReason(carno,agvStatus, device_code, "hongXiangStationDeviceDriver", message,eptMap,actMap); + actMap.put("act_move", hongXiangStationDeviceDriver.getMove()); + recordTaskStuckReason(carno, agvStatus, device_code, "hongXiangStationDeviceDriver", message, eptMap, actMap); } } else if (device.getDeviceDriver() instanceof PaperTubePickSiteDeviceDriver) { paperTubePickSiteDeviceDriver = (PaperTubePickSiteDeviceDriver) device.getDeviceDriver(); @@ -2287,17 +2349,17 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_action",0); - eptMap.put("ept_mode",2); - eptMap.put("ept_error",0); - eptMap.put("ept_move",null); + Map eptMap = new HashMap<>(); + eptMap.put("ept_action", 0); + eptMap.put("ept_mode", 2); + eptMap.put("ept_error", 0); + eptMap.put("ept_move", null); Map actMap = new HashMap<>(); - actMap.put("act_action",paperTubePickSiteDeviceDriver.getAction()); - actMap.put("act_mode",paperTubePickSiteDeviceDriver.getMode()); - actMap.put("act_error",paperTubePickSiteDeviceDriver.getError()); - actMap.put("act_move",paperTubePickSiteDeviceDriver.getMove()); - recordTaskStuckReason(carno,agvStatus, device_code, "paperTubePickSiteDeviceDriver", message,eptMap,actMap); + actMap.put("act_action", paperTubePickSiteDeviceDriver.getAction()); + actMap.put("act_mode", paperTubePickSiteDeviceDriver.getMode()); + actMap.put("act_error", paperTubePickSiteDeviceDriver.getError()); + actMap.put("act_move", paperTubePickSiteDeviceDriver.getMove()); + recordTaskStuckReason(carno, agvStatus, device_code, "paperTubePickSiteDeviceDriver", message, eptMap, actMap); } } else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver(); @@ -2325,14 +2387,14 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_move",1); + Map eptMap = new HashMap<>(); + eptMap.put("ept_move", 1); Map actMap = new HashMap<>(); - actMap.put("act_action",standardInspectSiteDeviceDriver.getAction()); - actMap.put("act_mode",standardInspectSiteDeviceDriver.getMode()); - actMap.put("act_error",standardInspectSiteDeviceDriver.getError()); - actMap.put("act_move",standardInspectSiteDeviceDriver.getMove()); - recordTaskStuckReason(carno,agvStatus, device_code, "standardInspectSiteDeviceDriver", message,eptMap,actMap); + actMap.put("act_action", standardInspectSiteDeviceDriver.getAction()); + actMap.put("act_mode", standardInspectSiteDeviceDriver.getMode()); + actMap.put("act_error", standardInspectSiteDeviceDriver.getError()); + actMap.put("act_move", standardInspectSiteDeviceDriver.getMove()); + recordTaskStuckReason(carno, agvStatus, device_code, "standardInspectSiteDeviceDriver", message, eptMap, actMap); } } else if (device.getDeviceDriver() instanceof WasteFoilWeighingStationDriver) { @@ -2366,17 +2428,17 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_action",1); - eptMap.put("ept_mode",2); - eptMap.put("ept_error",0); - eptMap.put("ept_move",1); + Map eptMap = new HashMap<>(); + eptMap.put("ept_action", 1); + eptMap.put("ept_mode", 2); + eptMap.put("ept_error", 0); + eptMap.put("ept_move", 1); Map actMap = new HashMap<>(); - actMap.put("act_action",wasteFoilWeighingStationDriver.getAction()); - actMap.put("act_mode",wasteFoilWeighingStationDriver.getMode()); - actMap.put("act_error",wasteFoilWeighingStationDriver.getError()); - actMap.put("act_move",wasteFoilWeighingStationDriver.getMove()); - recordTaskStuckReason(carno,agvStatus, device_code, "wasteFoilWeighingStationDriver", message,eptMap,actMap); + actMap.put("act_action", wasteFoilWeighingStationDriver.getAction()); + actMap.put("act_mode", wasteFoilWeighingStationDriver.getMode()); + actMap.put("act_error", wasteFoilWeighingStationDriver.getError()); + actMap.put("act_move", wasteFoilWeighingStationDriver.getMove()); + recordTaskStuckReason(carno, agvStatus, device_code, "wasteFoilWeighingStationDriver", message, eptMap, actMap); } } else { data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); @@ -2453,6 +2515,17 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic luceneExecuteLogService.deviceExecuteLog(logDto); this.setPhase(phase); + } else if (device.getDeviceDriver() instanceof OptoeleDockingStationDeviceDriver) { + optoeleDockingStationDeviceDriver = (OptoeleDockingStationDeviceDriver) device.getDeviceDriver(); + if (optoeleDockingStationDeviceDriver.getMode() > 0 && optoeleDockingStationDeviceDriver.getMove() == 0) { + data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); + LuceneLogDto logDto = LuceneLogDto.builder() + .device_code(this.getDeviceCode()) + .content("agvphase:" + phase + "反馈:" + data) + .build(); + logDto.setLog_level(4); + luceneExecuteLogService.deviceExecuteLog(logDto); + } } else if (device.getDeviceDriver() instanceof ManipulatorAgvStationDeviceDriver) { manipulatorAgvStationDeviceDriver = (ManipulatorAgvStationDeviceDriver) device.getDeviceDriver(); @@ -2481,17 +2554,18 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_action",1); - eptMap.put("ept_mode",2); - eptMap.put("ept_error",null); - eptMap.put("ept_move",null); + Map eptMap = new HashMap<>(); + eptMap.put("ept_action", 1); + eptMap.put("ept_mode", 2); + eptMap.put("ept_error", null); + eptMap.put("ept_move", null); Map actMap = new HashMap<>(); - actMap.put("act_action",manipulatorAgvStationDeviceDriver.getAction()); - actMap.put("act_mode",manipulatorAgvStationDeviceDriver.getMode()); + actMap.put("act_action", manipulatorAgvStationDeviceDriver.getAction()); + actMap.put("act_mode", manipulatorAgvStationDeviceDriver.getMode()); // actMap.put("act_error",manipulatorAgvStationDeviceDriver.getError()); // actMap.put("act_move",manipulatorAgvStationDeviceDriver.getMove()); - recordTaskStuckReason(carno,agvStatus, device_code, "manipulatorAgvStationDeviceDriver", message,eptMap,actMap); } + recordTaskStuckReason(carno, agvStatus, device_code, "manipulatorAgvStationDeviceDriver", message, eptMap, actMap); + } } else if (device.getDeviceDriver() instanceof HongXiangStationDeviceDriver) { hongXiangStationDeviceDriver = (HongXiangStationDeviceDriver) device.getDeviceDriver(); try { @@ -2520,11 +2594,11 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_move",0); + Map eptMap = new HashMap<>(); + eptMap.put("ept_move", 0); Map actMap = new HashMap<>(); - actMap.put("act_move",hongXiangStationDeviceDriver.getMove()); - recordTaskStuckReason(carno,agvStatus, device_code, "hongXiangStationDeviceDriver", message,eptMap,actMap); + actMap.put("act_move", hongXiangStationDeviceDriver.getMove()); + recordTaskStuckReason(carno, agvStatus, device_code, "hongXiangStationDeviceDriver", message, eptMap, actMap); } } else if (device.getDeviceDriver() instanceof PaperTubePickSiteDeviceDriver) { paperTubePickSiteDeviceDriver = (PaperTubePickSiteDeviceDriver) device.getDeviceDriver(); @@ -2555,17 +2629,17 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_action",1); - eptMap.put("ept_mode",2); - eptMap.put("ept_error",0); - eptMap.put("ept_move",null); + Map eptMap = new HashMap<>(); + eptMap.put("ept_action", 1); + eptMap.put("ept_mode", 2); + eptMap.put("ept_error", 0); + eptMap.put("ept_move", null); Map actMap = new HashMap<>(); - actMap.put("act_action",paperTubePickSiteDeviceDriver.getAction()); - actMap.put("act_mode",paperTubePickSiteDeviceDriver.getMode()); - actMap.put("act_error",paperTubePickSiteDeviceDriver.getError()); - actMap.put("act_move",paperTubePickSiteDeviceDriver.getMove()); - recordTaskStuckReason(carno,agvStatus, device_code, "paperTubePickSiteDeviceDriver", message,eptMap,actMap); + actMap.put("act_action", paperTubePickSiteDeviceDriver.getAction()); + actMap.put("act_mode", paperTubePickSiteDeviceDriver.getMode()); + actMap.put("act_error", paperTubePickSiteDeviceDriver.getError()); + actMap.put("act_move", paperTubePickSiteDeviceDriver.getMove()); + recordTaskStuckReason(carno, agvStatus, device_code, "paperTubePickSiteDeviceDriver", message, eptMap, actMap); } } else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver(); @@ -2595,17 +2669,17 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_action",1); - eptMap.put("ept_mode",null); - eptMap.put("ept_error",0); - eptMap.put("ept_move",0); + Map eptMap = new HashMap<>(); + eptMap.put("ept_action", 1); + eptMap.put("ept_mode", null); + eptMap.put("ept_error", 0); + eptMap.put("ept_move", 0); Map actMap = new HashMap<>(); - actMap.put("act_action",standardInspectSiteDeviceDriver.getAction()); - actMap.put("act_mode",standardInspectSiteDeviceDriver.getMode()); - actMap.put("act_error",standardInspectSiteDeviceDriver.getError()); - actMap.put("act_move",standardInspectSiteDeviceDriver.getMove()); - recordTaskStuckReason(carno,agvStatus, device_code, "standardInspectSiteDeviceDriver", message,eptMap,actMap); + actMap.put("act_action", standardInspectSiteDeviceDriver.getAction()); + actMap.put("act_mode", standardInspectSiteDeviceDriver.getMode()); + actMap.put("act_error", standardInspectSiteDeviceDriver.getError()); + actMap.put("act_move", standardInspectSiteDeviceDriver.getMove()); + recordTaskStuckReason(carno, agvStatus, device_code, "standardInspectSiteDeviceDriver", message, eptMap, actMap); } }/* else if (device.getDeviceDriver() instanceof RangingStationsDeviceDriver) { rangingStationsDeviceDriver = (RangingStationsDeviceDriver) device.getDeviceDriver(); @@ -2764,17 +2838,18 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_action",0); - eptMap.put("ept_mode",2); - eptMap.put("ept_error",null); - eptMap.put("ept_move",null); + Map eptMap = new HashMap<>(); + eptMap.put("ept_action", 0); + eptMap.put("ept_mode", 2); + eptMap.put("ept_error", null); + eptMap.put("ept_move", null); Map actMap = new HashMap<>(); - actMap.put("act_action",manipulatorAgvStationDeviceDriver.getAction()); - actMap.put("act_mode",manipulatorAgvStationDeviceDriver.getMode()); + actMap.put("act_action", manipulatorAgvStationDeviceDriver.getAction()); + actMap.put("act_mode", manipulatorAgvStationDeviceDriver.getMode()); // actMap.put("act_error",manipulatorAgvStationDeviceDriver.getError()); // actMap.put("act_move",manipulatorAgvStationDeviceDriver.getMove()); - recordTaskStuckReason(carno,agvStatus, device_code, "manipulatorAgvStationDeviceDriver", message,eptMap,actMap); } + recordTaskStuckReason(carno, agvStatus, device_code, "manipulatorAgvStationDeviceDriver", message, eptMap, actMap); + } } else if (device.getDeviceDriver() instanceof PaperTubePickSiteDeviceDriver) { paperTubePickSiteDeviceDriver = (PaperTubePickSiteDeviceDriver) device.getDeviceDriver(); try { @@ -2806,17 +2881,17 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_action",1); - eptMap.put("ept_mode",2); - eptMap.put("ept_error",0); - eptMap.put("ept_move",null); + Map eptMap = new HashMap<>(); + eptMap.put("ept_action", 1); + eptMap.put("ept_mode", 2); + eptMap.put("ept_error", 0); + eptMap.put("ept_move", null); Map actMap = new HashMap<>(); - actMap.put("act_action",paperTubePickSiteDeviceDriver.getAction()); - actMap.put("act_mode",paperTubePickSiteDeviceDriver.getMode()); - actMap.put("act_error",paperTubePickSiteDeviceDriver.getError()); - actMap.put("act_move",paperTubePickSiteDeviceDriver.getMove()); - recordTaskStuckReason(carno,agvStatus, device_code, "paperTubePickSiteDeviceDriver", message,eptMap,actMap); + actMap.put("act_action", paperTubePickSiteDeviceDriver.getAction()); + actMap.put("act_mode", paperTubePickSiteDeviceDriver.getMode()); + actMap.put("act_error", paperTubePickSiteDeviceDriver.getError()); + actMap.put("act_move", paperTubePickSiteDeviceDriver.getMove()); + recordTaskStuckReason(carno, agvStatus, device_code, "paperTubePickSiteDeviceDriver", message, eptMap, actMap); } } else if (device.getDeviceDriver() instanceof HongXiangStationDeviceDriver) { hongXiangStationDeviceDriver = (HongXiangStationDeviceDriver) device.getDeviceDriver(); @@ -2846,11 +2921,11 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_move",1); + Map eptMap = new HashMap<>(); + eptMap.put("ept_move", 1); Map actMap = new HashMap<>(); - actMap.put("act_move",hongXiangStationDeviceDriver.getMove()); - recordTaskStuckReason(carno,agvStatus, device_code, "hongXiangStationDeviceDriver", message,eptMap,actMap); + actMap.put("act_move", hongXiangStationDeviceDriver.getMove()); + recordTaskStuckReason(carno, agvStatus, device_code, "hongXiangStationDeviceDriver", message, eptMap, actMap); } } else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { @@ -2879,17 +2954,17 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic luceneExecuteLogService.deviceExecuteLog(logDto); // 记录任务卡住原因 - Map eptMap = new HashMap<>(); - eptMap.put("ept_action",1); - eptMap.put("ept_mode",null); - eptMap.put("ept_error",0); - eptMap.put("ept_move",1); + Map eptMap = new HashMap<>(); + eptMap.put("ept_action", 1); + eptMap.put("ept_mode", null); + eptMap.put("ept_error", 0); + eptMap.put("ept_move", 1); Map actMap = new HashMap<>(); - actMap.put("act_action",standardInspectSiteDeviceDriver.getAction()); - actMap.put("act_mode",standardInspectSiteDeviceDriver.getMode()); - actMap.put("act_error",standardInspectSiteDeviceDriver.getError()); - actMap.put("act_move",standardInspectSiteDeviceDriver.getMove()); - recordTaskStuckReason(carno,agvStatus, device_code, "standardInspectSiteDeviceDriver", message,eptMap,actMap); + actMap.put("act_action", standardInspectSiteDeviceDriver.getAction()); + actMap.put("act_mode", standardInspectSiteDeviceDriver.getMode()); + actMap.put("act_error", standardInspectSiteDeviceDriver.getError()); + actMap.put("act_move", standardInspectSiteDeviceDriver.getMove()); + recordTaskStuckReason(carno, agvStatus, device_code, "standardInspectSiteDeviceDriver", message, eptMap, actMap); } } else { data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0, 0, 0); @@ -3014,7 +3089,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic if (flag) { param.put("device_name", this.getDevice().getDevice_name()); param.put("device_type", "4"); - param.put("product_area", ISysParamService.findByCode("productArea").getValue()); + param.put("product_area", getSysParamValueOrDefault("productArea", "")); acsToWmsService.sendDeviceStatus(param); } } @@ -3069,7 +3144,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic param.put("error_msg", error == 0 ? "" : this.getError_message()); param.put("device_name", this.getDevice().getDevice_name()); param.put("device_type", "4"); - param.put("product_area", ISysParamService.findByCode("productArea").getValue()); + param.put("product_area", getSysParamValueOrDefault("productArea", "")); acsToWmsService.sendDeviceStatus(param); } last_error = error; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java index f10d7b83c..112d97cf9 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java @@ -163,8 +163,8 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements /** * 下发任务号 */ - String to_task = null; - String last_to_task = null; + int to_task = 0; + int last_to_task = 0; /** * 下发接纯数字托盘号 */ @@ -511,9 +511,9 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements this.instruction_require_time = date; //查找有没有对应的指令 Instruction inst; - if ("RK1032".equals(this.device_code)||"RK1034".equals(this.device_code)||"RK1035".equals(this.device_code)){ + if ("RK1032".equals(this.device_code) || "RK1034".equals(this.device_code) || "RK1035".equals(this.device_code)) { inst = instructionService.findByStartCodeAndReady2(this.device_code); - }else { + } else { inst = instructionService.findByStartCodeAndReady(this.device_code); } if (ObjectUtil.isNotNull(inst)) { @@ -803,8 +803,8 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements // led_message = getLedMessage(instdto); //写完信号to_task写成功后更新指令为执行中 inst = checkInst(); - to_task = this.itemProtocol.getTo_task(); - if (Integer.parseInt(to_task)>0 && to_task.equals(inst.getInstruction_code())) { + to_task = this.itemProtocol.getTo_task(); + if (to_task > 0 && to_task == Integer.parseInt(inst.getInstruction_code())) { inst.setInstruction_status(CommonFinalParam.ONE); inst.setExecute_device_code(this.device_code); instructionService.update(inst); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/ItemProtocol.java index 3dac73a82..5721f8037 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/ItemProtocol.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/ItemProtocol.java @@ -110,8 +110,8 @@ public class ItemProtocol { return this.getOpcIntegerValue(item_task); } - public String getTo_task() { - return this.getOpcStringValue(item_to_task); + public int getTo_task() { + return this.getOpcIntegerValue(item_to_task); } @@ -151,7 +151,7 @@ public class ItemProtocol { } else { return value; } - return ""; + return "0"; } public int[] getOpcArrayValue(String protocol) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/optoele_docking_station/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/optoele_docking_station/ItemProtocol.java new file mode 100644 index 000000000..615ff7dad --- /dev/null +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/optoele_docking_station/ItemProtocol.java @@ -0,0 +1,88 @@ +package org.nl.acs.device_driver.conveyor.optoele_docking_station; + +import cn.hutool.core.util.StrUtil; +import lombok.Getter; +import lombok.Setter; +import lombok.extern.slf4j.Slf4j; +import org.nl.acs.device.device_driver.standard_inspect.ItemDto; + +import java.util.ArrayList; +import java.util.List; + +@Slf4j +@Getter +@Setter +public class ItemProtocol { + + public static String item_heartbeat = "heartbeat"; + public static String item_mode = "mode"; + public static String item_move = "move"; + + + Boolean isonline; + + private OptoeleDockingStationDeviceDriver driver; + + public ItemProtocol(OptoeleDockingStationDeviceDriver driver) { + this.driver = driver; + } + + public int getHeartbeat() { + return this.getOpcIntegerValue(item_heartbeat); + } + + public int getMode() { + return this.getOpcIntegerValue(item_mode); + } + + public int getMove() { + return this.getOpcIntegerValue(item_move); + } + + /** + * 是否有货 + * @param move + * @return + */ + public int hasGoods(int move) { + return move; + } + + + public int getOpcIntegerValue(String protocol) { + Integer value = this.driver.getIntegeregerValue(protocol); + if (value == null) { +// log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!"); + setIsonline(false); + } else { + setIsonline(true); + return value; + } + return 0; + } + + public String getOpcStringValue(String protocol) { + String value = this.driver.getStringValue(protocol); + if (StrUtil.isBlank(value)) { +// log.error("读取错误!"); + } else { + return value; + } + return "0"; + } + + public static List getReadableItemDtos() { + ArrayList list = new ArrayList(); + list.add(new ItemDto(item_heartbeat, "心跳", "DB81.B10")); + list.add(new ItemDto(item_mode, "工作模式", "DB81.B1", Boolean.valueOf(true))); + list.add(new ItemDto(item_move, "光电开关信号", "DB81.B2")); + return list; + } + + public static List getWriteableItemDtos() { + ArrayList list = new ArrayList(); + return list; + } + +} + diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/optoele_docking_station/OptoeleDockingStationDefination.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/optoele_docking_station/OptoeleDockingStationDefination.java new file mode 100644 index 000000000..391652399 --- /dev/null +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/optoele_docking_station/OptoeleDockingStationDefination.java @@ -0,0 +1,61 @@ +package org.nl.acs.device_driver.conveyor.optoele_docking_station; + +import org.nl.acs.device.device_driver.standard_inspect.ItemDto; +import org.nl.acs.device.domain.Device; +import org.nl.acs.device.enums.DeviceType; +import org.nl.acs.device_driver.DeviceDriver; +import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.springframework.stereotype.Service; + +import java.util.LinkedList; +import java.util.List; + +/** + * 普通光电对接点 + */ +@Service +public class OptoeleDockingStationDefination implements OpcDeviceDriverDefination { + @Override + public String getDriverCode() { + return "optoele_docking_station"; + } + + @Override + public String getDriverName() { + return "标准版-普通光电对接点"; + } + + @Override + public String getDriverDescription() { + return "标准版-普通光电对接点"; + } + + @Override + public DeviceDriver getDriverInstance(Device device) { + return (new OptoeleDockingStationDeviceDriver()).setDevice(device).setDriverDefination(this); + + } + + @Override + public Class getDeviceDriverType() { + return OptoeleDockingStationDeviceDriver.class; + } + + @Override + public List getFitDeviceTypes() { + List types = new LinkedList(); + types.add(DeviceType.station); + return types; + } + + @Override + public List getReadableItemDtos() { + return ItemProtocol.getReadableItemDtos(); + } + + @Override + public List getWriteableItemDtos() { + return ItemProtocol.getWriteableItemDtos(); + } + +} diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/optoele_docking_station/OptoeleDockingStationDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/optoele_docking_station/OptoeleDockingStationDeviceDriver.java new file mode 100644 index 000000000..59b61065c --- /dev/null +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/optoele_docking_station/OptoeleDockingStationDeviceDriver.java @@ -0,0 +1,63 @@ +package org.nl.acs.device_driver.conveyor.optoele_docking_station; + +import com.alibaba.fastjson.JSONObject; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import lombok.Setter; +import lombok.extern.slf4j.Slf4j; +import org.nl.acs.device.domain.Device; +import org.nl.acs.device_driver.DeviceDriver; +import org.nl.acs.device_driver.RouteableDeviceDriver; +import org.nl.acs.device_driver.StandardRequestMethod; +import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; +import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; +import org.nl.acs.monitor.DeviceStageMonitor; + + +/** + * 标准版-普通光电对接点 + */ +@Slf4j +@Getter +@Setter +@RequiredArgsConstructor +public class OptoeleDockingStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor, StandardRequestMethod { + + protected ItemProtocol itemProtocol = new ItemProtocol(this); + + String device_code; + int mode = 0; + int last_mode = 0; + int move = 0; + int last_move = 0; + + Boolean isonline = true; + + @Override + public Device getDevice() { + return this.device; + } + + + @Override + public void execute() { + device_code = this.getDeviceCode(); + mode = this.itemProtocol.getMode(); + move = this.itemProtocol.getMove(); + + last_mode = mode; + last_move = move; + } + + @Override + public JSONObject getDeviceStatusName() throws Exception { + JSONObject jo = new JSONObject(); + return jo; + } + + @Override + public void setDeviceStatus(JSONObject data) { + + } + +} diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java index 141c1fb8b..1cbda8388 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java @@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import lombok.Data; @@ -22,6 +23,7 @@ import org.nl.acs.device_driver.conveyor.siemens_conveyor.SiemensConveyorDeviceD import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.device_driver.one_conveyor.box_subvolumes_conveyor.BoxSubvolumesConveyorDeviceDriver; +import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.history.ErrorUtil; import org.nl.acs.history.service.DeviceErrorLogService; import org.nl.acs.history.service.impl.DeviceErrorLogServiceImpl; @@ -45,6 +47,8 @@ import org.nl.config.language.LangProcess; import org.nl.config.lucene.service.LuceneExecuteLogService; import org.nl.config.lucene.service.dto.LuceneLogDto; +import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.*; import java.util.stream.Collectors; @@ -72,6 +76,7 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i DeviceErrorLogService errorLogServer = SpringContextHolder.getBean(DeviceErrorLogServiceImpl.class); LuceneExecuteLogService luceneExecuteLogService = SpringContextHolder.getBean("luceneExecuteLogServiceImpl"); + AcsToWmsService acsToWmsService = SpringContextHolder.getBean(AcsToWmsService.class); int mode = 0; int last_mode = 0; @@ -80,8 +85,11 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i int last_action = 0; int error = 0; int task = 0; + String barcode = null; + float weight = 0.0f; int heartbeat = 0; int to_command = 0; + int last_to_command = 0; int to_target = 0; int to_onset = 0; @@ -141,6 +149,10 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i mode = this.itemProtocol.getMode(); move = this.itemProtocol.getMove(); action = this.itemProtocol.getAction(); + weight = new BigDecimal(Float.toString(this.itemProtocol.getWeight())) + .setScale(1, RoundingMode.HALF_UP) + .floatValue(); + barcode = this.itemProtocol.getBarcode(); error = this.itemProtocol.getError(); task = this.itemProtocol.getTask(); heartbeat = this.itemProtocol.getHeartbeat(); @@ -154,9 +166,31 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i if (mode != last_mode) { requireSucess = false; } - if(action == last_action){ + if(action != last_action){ requireActionSucess = false; } + + //以防出现未知问题，桁架称重完成变成6后，给桁架反馈6 + if (action == 6 && !this.requireActionSucess){ + Map map1 = new HashMap<>(); + List list = new ArrayList(); + map1.put("code", "to_command"); + map1.put("value", 6); + list.add(map1); + this.writing(list); + this.requireActionSucess = true; + } + + //清除下发桁架的6 + if (to_command != last_to_command && to_command == 6){ + Map map1 = new HashMap<>(); + List list = new ArrayList(); + map1.put("code", "to_command"); + map1.put("value", 0); + list.add(map1); + this.writing(list); + } + // 更新指令状态 if (mode == 3 && task > 0 && !requireActionSucess) { updateInstructionStatus(); @@ -190,7 +224,6 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i } } else { String remark = ""; - ; if (mode != 2) { remark = "universal_remark2"; } @@ -227,7 +260,7 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i last_mode =mode; last_action = action; - + last_to_command = to_command; } private void updateInstructionStatus() { @@ -248,6 +281,24 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i } } + if (action == 2 && move == 1 && weight > 0){ + Map request = new HashMap<>(); + request.put("task_code",inst.getTask_code()); + request.put("barcode",barcode); +// request.put("weight",weight); + request.put("weight", String.format("%.1f", weight)); + HttpResponse resp = acsToWmsService.feedBoxWeight(request); + if (resp != null && resp.getStatus() == 200){ + Map map1 = new HashMap<>(); + List list = new ArrayList(); + map1.put("code", "to_command"); + map1.put("value", 2); + list.add(map1); + this.writing(list); + this.requireActionSucess = true; + } + } + //任务完成 if (action == 5 && move == 0) { if (inst != null) { @@ -595,7 +646,7 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i jo.put("isError", this.getIserror()); jo.put("message", LangProcess.msg(message)); jo.put("notCreateTaskMessage", notCreateTaskMessage); - jo.put("notCreateInstMessage", LangProcess.msg(notCreateInstMessage)); + jo.put("notCreateInstMessage", LangProcess.msg(notCreateInstMessage)); jo.put("feedMessage", LangProcess.msg(feedMessage)); jo.put("driver_type", "box_storage_manipulator"); jo.put("is_click", true); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/ItemProtocol.java index 78d04d793..e7bf29abd 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/ItemProtocol.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/ItemProtocol.java @@ -32,6 +32,14 @@ public class ItemProtocol { * 任务号 */ public static String item_task = "task"; + /** + * 木箱重量 + */ + public static String item_weight = "weight"; + /** + * 条码 + */ + public static String item_barcode = "barcode"; /** * 报警 */ @@ -146,6 +154,12 @@ public class ItemProtocol { public int getTask() { return this.getOpcIntegerValue(item_task); } + public Float getWeight() { + return this.getOpcFloatValue(item_weight); + } + public String getBarcode() { + return this.getOpcStringValue(item_barcode); + } public int getWalk_y() { @@ -220,6 +234,8 @@ public class ItemProtocol { list.add(new ItemDto(item_action, "动作信号", "DB1.B3")); list.add(new ItemDto(item_error, "报警信号", "DB1.B5")); list.add(new ItemDto(item_task, "任务号", "DB1.D6")); + list.add(new ItemDto(item_weight, "重量", "DB1.D6")); + list.add(new ItemDto(item_barcode, "条码", "DB1.D6")); list.add(new ItemDto(item_walk_y, "行走列", "DB1.B4")); list.add(new ItemDto(item_x, "行走列号", "DB101.B10")); list.add(new ItemDto(item_y, "行走层号", "DB101.B11")); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java index 3635db72c..f0c1d05e5 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java @@ -611,7 +611,6 @@ public class PlugPullDeviceSiteDeviceDriver extends AbstractOpcDeviceDriver impl Date date = new Date(); if (date.getTime() - this.applyPullShaft_time.getTime() < (long) this.applyPullShaft_time_out) { log.trace("触发时间因为小于{}毫秒，而被无视", this.applyPullShaft_time_out); - return; } else { this.applyPullShaft_time = date; logServer.deviceExecuteLog(this.device_code, "", "", "申请拔轴"); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java index b7b4c411d..315d7a755 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java @@ -10,6 +10,8 @@ import org.nl.acs.ext.wms.data.one.ApplyLabelingAndBindingResponse; import org.nl.acs.ext.wms.data.one.BaseRequest; import org.nl.acs.instruction.domain.Instruction; +import java.util.Map; + public interface AcsToWmsService { @@ -225,4 +227,6 @@ public interface AcsToWmsService { * @return */ ManipulatorApplyPointResponse manipulatorApplyPointRequest(ManipulatorApplyPointRequest param); + + HttpResponse feedBoxWeight(Map request); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java index 5754035d5..50a8e17c8 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java @@ -818,6 +818,35 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { return manipulatorApplyPointResponse; } + @Override + public HttpResponse feedBoxWeight(Map request) { + try { + MDC.put(log_file_type, log_type); + String wmsurl = paramService.findByCode(AcsConfig.WMSURL).getValue(); + HttpResponse result = null; + log.info("feedBoxWeight反馈LMS机械手重量-----请求参数{}", request.toString()); + AddressDto addressDto = addressService.findByCode("feedBoxWeight"); + String methods_url = addressDto.getMethods_url(); + try { + result = HttpRequest.post(wmsurl + methods_url) + .addInterceptor(tLogHutoolhttpInterceptor) + .header(Header.USER_AGENT, "Hutool http") + .header("Authorization", token) + .body(JSON.toJSONString(request)) + .execute(); + log.info("feedBoxWeight反馈LMS机械手重量-----输出参数{}", result); + } catch (Exception e) { + String msg = e.getMessage(); + //网络不通 +// //System.out.println(msg); + log.info("feedBoxWeight反馈LMS机械手重量-----输出参数{}", msg); + } + return result; + } finally { + MDC.remove(log_file_type); + } + } + @Override public void actionFinishRequest2(JSONObject jsonObject) { HttpResponse execute = null; diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml b/acs2/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml index 427aaa5df..09a3c16ee 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml @@ -72,7 +72,7 @@ https://juejin.cn/post/6844903775631572999 - + + + + diff --git a/acs2/nladmin-ui/.env.development b/acs2/nladmin-ui/.env.development index e37a9a4f0..66099633e 100644 --- a/acs2/nladmin-ui/.env.development +++ b/acs2/nladmin-ui/.env.development @@ -1,7 +1,7 @@ ENV = 'development' # 接口地址 -VUE_APP_BASE_API = 'http://localhost:8011' +VUE_APP_BASE_API = 'http://127.0.0.1:8011' VUE_APP_WS_API = 'ws://localhost:8011' # 是否启用 babel-plugin-dynamic-import-node插件 diff --git a/acs2/nladmin-ui/.env.production b/acs2/nladmin-ui/.env.production index d34affad5..8ff970ab4 100644 --- a/acs2/nladmin-ui/.env.production +++ b/acs2/nladmin-ui/.env.production @@ -2,6 +2,6 @@ ENV = 'production' # 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置 # 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http -VUE_APP_BASE_API = 'http://10.1.3.97:8011' +VUE_APP_BASE_API = 'http://10.1.3.96:8011' # 如果接口是 http 形式， wss 需要改为 ws -VUE_APP_WS_API = 'ws://10.1.3.97:8011' +VUE_APP_WS_API = 'ws://10.1.3.96:8011' diff --git a/acs2/nladmin-ui/src/views/acs/device/config.vue b/acs2/nladmin-ui/src/views/acs/device/config.vue index db94c0420..6738e1fe6 100644 --- a/acs2/nladmin-ui/src/views/acs/device/config.vue +++ b/acs2/nladmin-ui/src/views/acs/device/config.vue @@ -108,6 +108,7 @@ import box_manipulator from '@/views/acs/device/driver/box_manipulator.vue' import conveyor_with_scanner_weight from '@/views/acs/device/driver/conveyor_with_scanner_weight.vue' import box_manipulator_site from '@/views/acs/device/driver/box_manipulator_site.vue' import rgv from '@/views/acs/device/driver/rgv.vue' +import optoele_docking_station from '@/views/acs/device/driver/optoele_docking_station.vue' import dry_manipulator from '@/views/acs/device/driver/dry_manipulator.vue' import blanking_button from '@/views/acs/device/driver/blanking_button.vue' import pull_head_manipulator from '@/views/acs/device/driver/pull_head_manipulator.vue' @@ -200,7 +201,8 @@ export default { paper_tube_pick_size, one_rgv, die_manipulator, - raster + raster, + optoele_docking_station }, dicts: ['device_type'], mixins: [crud], diff --git a/acs2/nladmin-ui/src/views/acs/device/driver/optoele_docking_station.vue b/acs2/nladmin-ui/src/views/acs/device/driver/optoele_docking_station.vue new file mode 100644 index 000000000..9cd29812f --- /dev/null +++ b/acs2/nladmin-ui/src/views/acs/device/driver/optoele_docking_station.vue @@ -0,0 +1,539 @@ + + + + +