diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java index ea818705c..54c66a6d4 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java @@ -72,7 +72,15 @@ public class NDCAgvServiceImpl implements NDCAgvService { }; log.info("下发删除AGV指令--{}", Bytes2HexString(b)); -// NDCSocketConnectionAutoRun.write(b); + + if (StrUtil.equals(inst.getAgv_system_type(),"1")){ + OneNDCSocketConnectionAutoRun.write(b); + } else if (StrUtil.equals(inst.getAgv_system_type(),"2")){ + TwoNDCSocketConnectionAutoRun.write(b); + } else if (StrUtil.equals(inst.getAgv_system_type(),"3")){ + TwoNDC2SocketConnectionAutoRun.write(b); + } + System.out.println("下发删除agv指令数据:" + Bytes2HexString(b)); } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device/wql/task_inst.xls b/acs/nladmin-system/src/main/java/org/nl/acs/device/wql/task_inst.xls index 665ebb77d..9a913ea95 100644 Binary files a/acs/nladmin-system/src/main/java/org/nl/acs/device/wql/task_inst.xls and b/acs/nladmin-system/src/main/java/org/nl/acs/device/wql/task_inst.xls differ diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDeviceDriver.java index 3e4e3c007..83dcb5a37 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDeviceDriver.java @@ -88,12 +88,14 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic inst = instructionService.findByCodeFromCache(String.valueOf(ikey)); if(ObjectUtil.isEmpty(inst)){ log.info("该指令号未找到对应指令:"+ikey); + message = "该指令号未找到对应指令:"+ikey; logServer.deviceExecuteLog(this.device_code, "", "", "该指令号未找到对应指令:"+ikey); return; } task = taskService.findByTaskCode(inst.getTask_code()); if(ObjectUtil.isEmpty(task)){ log.info("该指令号未找到对应任务:"+ikey); + message = "该指令号未找到对应任务:"+ikey; logServer.deviceExecuteLog(this.device_code, "", "", "该指令号未找到对应任务:"+ikey); return; } @@ -187,6 +189,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); } else { log.info("等待LMS系统进行确认允许取货，设备号{},指令号{}", device_code,ikey); + message = "等待LMS系统进行确认允许取货,设备号:"+device_code +",指令号:"+ikey; logServer.deviceExecuteLog(this.device_code, "", "", "等待LMS系统进行确认允许取货,设备号"+device.getDevice_code()+",指令号"+ikey); } } else { @@ -205,9 +208,9 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic if(standardInspectSiteDeviceDriver.getMove() == 1 && standardInspectSiteDeviceDriver.getAction() == 1){ data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); } else { + message = "设备号:"+device_code + "光电信号:" + standardInspectSiteDeviceDriver.getMove() + ",动作信号:"+ standardInspectSiteDeviceDriver.getAction() + ",指令号:"+ikey; log.info("设备{}当前光电信号{}，动作信号{}，不满足取货条件,指令号{}", device_code,standardInspectSiteDeviceDriver.getMove(),standardInspectSiteDeviceDriver.getAction(),ikey); } - } else { data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); @@ -270,6 +273,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic if(standardInspectSiteDeviceDriver.getMove() == 0 ){ data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); } else { + message = "设备号:"+device_code + "光电信号:" + standardInspectSiteDeviceDriver.getMove() + ",动作信号:"+ standardInspectSiteDeviceDriver.getAction() + ",指令号:"+ikey; log.info("设备{}当前光电信号{}，动作信号{}，不满足取货条件", device_code,standardInspectSiteDeviceDriver.getMove()); } } else { @@ -318,6 +322,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); } else { log.info("等待LMS系统进行确认允许取货，设备号{},指令号{}", device_code,ikey); + message = "等待LMS系统进行确认允许取货,设备号:"+device_code +",指令号:"+ikey; logServer.deviceExecuteLog(this.device_code, "", "", "等待LMS系统进行确认允许取货,设备号"+device.getDevice_code()); } @@ -398,7 +403,9 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic if(ObjectUtil.isNotEmpty(task)){ logServer.deviceExecuteLog(this.device_code, "", "", "上报满卷重量,weight:" + weight); + message = "上报满卷重量,weight:"+weight +",指令号:"+ikey; task.setWeight(String.valueOf(weight)); + task.setCarno(this.device_code); taskService.update(task); } data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); @@ -505,7 +512,8 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); standardOrdinarySiteDeviceDriver.setOption(0); } else { - log.info("等待LMS系统进行确认离开，设备号{}", device_code); + log.info("等待LMS系统进行确认离开，设备号{},指令号:{}", device_code,ikey); + message = "等待LMS系统进行确认离开,设备号:"+device_code +",指令号:"+ikey; } } else { data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); @@ -563,7 +571,8 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); standardOrdinarySiteDeviceDriver.setOption(0); } else { - log.info("等待LMS系统进行确认离开，设备号{}", device_code); + log.info("等待LMS系统进行确认离开，设备号{},指令号:{}", device_code,ikey); + message = "等待LMS系统进行确认离开,设备号:"+device_code +",指令号:"+ikey; } } else { data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); @@ -619,7 +628,8 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); standardOrdinarySiteDeviceDriver.setOption(0); } else { - log.info("等待LMS系统进行确认离开，设备号{}", device_code); + log.info("等待LMS系统进行确认离开，设备号{},指令号:{}", device_code,ikey); + message = "等待LMS系统进行确认离开,设备号:"+device_code +",指令号:"+ikey; } } else { data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); @@ -701,33 +711,36 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic if(this.getPhase() ==0 ){ phase = "无任务"; } else if (this.getPhase() == 1) { - phase = "1 开始任务"; + phase = "1 0X01 开始任务"; } else if (this.getPhase() == 2) { - phase = "2 分配车号"; + phase = "2 0X02 分配车号"; } else if (this.getPhase() == 3) { - phase = "3 到达取货点1"; + phase = "3 0X03 到达取货点1"; } else if (this.getPhase() == 5) { - phase = "5 取货点1取货完毕"; + phase = "5 0X05 取货点1请求离开"; } else if (this.getPhase() == 8) { - phase = "8 到达取货点2"; + phase = "8 0X08 到达取货点2"; } else if (this.getPhase() == 10) { - phase = "开始任务"; - } else if (this.getPhase() == 3) { - phase = "开始任务"; - } else if (this.getPhase() == 3) { - phase = "开始任务"; - } else if (this.getPhase() == 3) { - phase = "开始任务"; - } else if (this.getPhase() == 3) { - phase = "开始任务"; - } else if (this.getPhase() == 3) { - phase = "开始任务"; + phase = "10 0X0A 取货点2请求离开"; + } else if (this.getPhase() == 12) { + phase = "12 0X0C 到达放货点"; + } else if (this.getPhase() == 14) { + phase = "14 0X0E 放货完成"; + } else if (this.getPhase() == 16) { + phase = "16 0X10 到达放货点"; + } else if (this.getPhase() == 18) { + phase = "18 0X12 放货完成"; + } else if (this.getPhase() == 20) { + phase = "20 0X14 任务完毕"; + } else if (this.getPhase() == 100) { + phase = "100 0X64 上报称重"; } - - jo.put("isOnline", this.getIsonline()); + jo.put("phase", phase); + jo.put("isOnline", true); jo.put("error", this.getError()); jo.put("isError", this.getIserror()); jo.put("message", this.getMessage()); + jo.put("agv_power", this.getAgv_power()); jo.put("device_name", this.getDevice().getDevice_name()); jo.put("mode", mode); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java index 6e9437480..0e6139385 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java @@ -131,9 +131,9 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i error = this.itemProtocol.getError(); task = this.itemProtocol.getTask(); heartbeat = this.itemProtocol.getHeartbeat(); - if(heartbeat != last_heartbeat){ - logServer.deviceExecuteLog(this.device_code, "", "", "heartbeat：" + last_heartbeat + "->" + heartbeat); - } +// if(heartbeat != last_heartbeat){ +// logServer.deviceExecuteLog(this.device_code, "", "", "heartbeat：" + last_heartbeat + "->" + heartbeat); +// } if (mode != last_mode) { if (mode == 2) { logServer.deviceExecuteLog(this.device_code, "", "", "信号复位前requireSuccess：" + requireSucess); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java index de987c5cc..e2eb3f95e 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java @@ -151,9 +151,9 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme task = this.itemProtocol.getTask(); to_command = this.itemProtocol.getTo_command(); heartbeat = this.itemProtocol.getHeartbeat(); - if(heartbeat != last_heartbeat){ - logServer.deviceExecuteLog(this.device_code, "", "", "heartbeat：" + last_heartbeat + "->" + heartbeat); - } +// if(heartbeat != last_heartbeat){ +// logServer.deviceExecuteLog(this.device_code, "", "", "heartbeat：" + last_heartbeat + "->" + heartbeat); +// } if (mode != last_mode) { if (mode == 2) { requireSucess = false; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java index 33c9e544e..e147b749b 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java @@ -144,9 +144,9 @@ public class SiemensConveyorCkkDeviceDriver extends AbstractOpcDeviceDriver impl error = this.itemProtocol.getError(); task = this.itemProtocol.getTask(); heartbeat = this.itemProtocol.getHeartbeat(); - if(heartbeat != last_heartbeat){ - logServer.deviceExecuteLog(this.device_code, "", "", "heartbeat：" + last_heartbeat + "->" + heartbeat); - } +// if(heartbeat != last_heartbeat){ +// logServer.deviceExecuteLog(this.device_code, "", "", "heartbeat：" + last_heartbeat + "->" + heartbeat); +// } if (mode != last_mode) { if (mode == 2) { requireSucess = false; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java index f44486b82..a35180fcd 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java @@ -141,9 +141,9 @@ public class SiemensConveyorLabelingDeviceDriver extends AbstractOpcDeviceDriver task = this.itemProtocol.getTask(); weight = this.itemProtocol.getWeight(); heartbeat = this.itemProtocol.getHeartbeat(); - if(heartbeat != last_heartbeat){ - logServer.deviceExecuteLog(this.device_code, "", "", "heartbeat：" + last_heartbeat + "->" + heartbeat); - } +// if(heartbeat != last_heartbeat){ +// logServer.deviceExecuteLog(this.device_code, "", "", "heartbeat：" + last_heartbeat + "->" + heartbeat); +// } if (mode != last_mode) { if (mode == 2) { requireSucess = false; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java index 0d781b293..a36d2574c 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java @@ -162,9 +162,9 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl to_command1 = this.itemProtocol.getTo_command1(); to_command2 = this.itemProtocol.getTo_command2(); heartbeat = this.itemProtocol.getHeartbeat(); - if(heartbeat != last_heartbeat){ - logServer.deviceExecuteLog(this.device_code, "", "", "heartbeat：" + last_heartbeat + "->" + heartbeat); - } +// if(heartbeat != last_heartbeat){ +// logServer.deviceExecuteLog(this.device_code, "", "", "heartbeat：" + last_heartbeat + "->" + heartbeat); +// } if (mode != last_mode) { if (mode == 2) { logServer.deviceExecuteLog(device_code, "", "", "开始请求标记复位`此时请求标记值为:" + requireSucess); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java index 3f57a45c1..ca4a03c45 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java @@ -1,5 +1,6 @@ package org.nl.acs.device_driver.basedriver.standard_autodoor; +import com.alibaba.fastjson.JSONObject; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -7,6 +8,7 @@ import org.nl.acs.device_driver.DeviceDriver; import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; import org.nl.acs.log.service.DeviceExecuteLogService; +import org.nl.acs.monitor.DeviceStageMonitor; import org.nl.acs.opc.Device; import org.nl.modules.wql.util.SpringContextHolder; @@ -20,7 +22,7 @@ import java.util.Map; @Slf4j @Data @RequiredArgsConstructor -public class StandardAutodoorDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver { +public class StandardAutodoorDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, DeviceStageMonitor { protected ItemProtocol itemProtocol = new ItemProtocol(this); DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); @@ -44,9 +46,10 @@ public class StandardAutodoorDeviceDriver extends AbstractOpcDeviceDriver implem open = this.itemProtocol.getOpen(); close = this.itemProtocol.getClose(); if (open != last_open) { - + logServer.deviceExecuteLog(this.device_code, "", "", "信号open：" + last_open + "->" + open); } if (close != last_close) { + logServer.deviceExecuteLog(this.device_code, "", "", "信号close：" + last_close + "->" + close); } @@ -66,4 +69,33 @@ public class StandardAutodoorDeviceDriver extends AbstractOpcDeviceDriver implem } + @Override + public JSONObject getDeviceStatusName() { + JSONObject jo = new JSONObject(); + String open = ""; + String close = ""; + if(this.getOpen() == 0){ + open = "未知"; + } else if(this.getOpen() == 1){ + open = "开到位"; + } + if(this.getClose() == 0){ + open = "未知"; + } else if(this.getOpen() == 1){ + open = "关到位"; + } + jo.put("device_name", this.getDevice().getDevice_name()); + jo.put("open", open); + jo.put("close", close); + jo.put("isOnline", true); + + return jo; + } + + @Override + public void setDeviceStatus(JSONObject data) { + + } + + } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index cd05723f8..7e217e763 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -16,6 +16,7 @@ import org.nl.acs.device_driver.basedriver.cargo_lift_conveyor.CargoLiftConveyor import org.nl.acs.device_driver.basedriver.empty_vehicle_stacking_position.EmptyVehicleStackingPositionDeviceDriver; import org.nl.acs.device_driver.basedriver.hongxiang_conveyor.HongXiangStationDeviceDriver; import org.nl.acs.device_driver.basedriver.hongxiang_device.HongXiangConveyorDeviceDriver; +import org.nl.acs.device_driver.basedriver.lamp_three_color.LampThreecolorDeviceDriver; import org.nl.acs.device_driver.basedriver.plug_pull_device_site.PlugPullDeviceSiteDeviceDriver; import org.nl.acs.device_driver.basedriver.siemens_conveyor.SiemensConveyorDeviceDriver; import org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver; @@ -170,12 +171,15 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { throw new Exception("未找到对应设备:" + device_code); } HongXiangStationDeviceDriver hongXiangStationDeviceDriver; - PlugPullDeviceSiteDeviceDriver plugPullDeviceSiteDeviceDriver; + LampThreecolorDeviceDriver lampThreecolorDeviceDriver; if (device.getDeviceDriver() instanceof HongXiangStationDeviceDriver) { hongXiangStationDeviceDriver = (HongXiangStationDeviceDriver) device.getDeviceDriver(); hongXiangStationDeviceDriver.writing(code, value); } - + if (device.getDeviceDriver() instanceof LampThreecolorDeviceDriver) { + lampThreecolorDeviceDriver = (LampThreecolorDeviceDriver) device.getDeviceDriver(); + lampThreecolorDeviceDriver.writing(code, value); + } } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java index c80a62dd1..db8e149ae 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java @@ -290,4 +290,10 @@ public class TaskDto implements Serializable { * 烘箱温度 */ private String temperature; + + /** + * 车号 + */ + private String carno; + } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index 5ab39530e..c6ca173c4 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -680,6 +680,9 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { if(ObjectUtil.isNotEmpty(dto.getWeight())){ feed_jo.put("weight",dto.getWeight()); } + if(ObjectUtil.isNotEmpty(dto.getCarno())){ + feed_jo.put("car_no",dto.getCarno()); + } JSONArray ja = new JSONArray(); ja.add(feed_jo); String message = null; diff --git a/acs/nladmin-system/src/main/resources/config/application-dev.yml b/acs/nladmin-system/src/main/resources/config/application-dev.yml index f57637425..a1f56261a 100644 --- a/acs/nladmin-system/src/main/resources/config/application-dev.yml +++ b/acs/nladmin-system/src/main/resources/config/application-dev.yml @@ -13,11 +13,11 @@ spring: driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy # url: jdbc:log4jdbc:mysql://${DB_HOST:10.1.3.91}:${DB_PORT:3306}/${DB_NAME:acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true # url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:lzhl_one_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true - url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lzhl_one_wcs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true + url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lzhl_one_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true username: ${DB_USER:root} # password: ${DB_PWD:P@ssw0rd} # password: ${DB_PWD:Root.123456} - password: ${DB_PWD:password} + password: ${DB_PWD:123456} # 初始连接数 initial-size: 5 diff --git a/acs/nladmin-system/src/main/resources/log/AcsToWms.xml b/acs/nladmin-system/src/main/resources/log/AcsToWms.xml index 1fd47dab8..670abbeef 100644 --- a/acs/nladmin-system/src/main/resources/log/AcsToWms.xml +++ b/acs/nladmin-system/src/main/resources/log/AcsToWms.xml @@ -6,7 +6,7 @@ - ${LOG_HOME}/ACS请求WMS/%d{yyyy-MM-dd}.%i.log + ${LOG_HOME}/ACS请求LMS/%d{yyyy-MM-dd}.%i.log 15 diff --git a/acs/nladmin-system/src/main/resources/log/WmsToAcs.xml b/acs/nladmin-system/src/main/resources/log/WmsToAcs.xml index 9c26bdaee..f26a6ef74 100644 --- a/acs/nladmin-system/src/main/resources/log/WmsToAcs.xml +++ b/acs/nladmin-system/src/main/resources/log/WmsToAcs.xml @@ -6,7 +6,7 @@ - ${LOG_HOME}/WMS下发ACS/%d{yyyy-MM-dd}.%i.log + ${LOG_HOME}/LMS下发ACS/%d{yyyy-MM-dd}.%i.log 15 diff --git a/acs/nladmin-ui/src/views/system/monitor/device/index.vue b/acs/nladmin-ui/src/views/system/monitor/device/index.vue index 3f0233add..46de2c227 100644 --- a/acs/nladmin-ui/src/views/system/monitor/device/index.vue +++ b/acs/nladmin-ui/src/views/system/monitor/device/index.vue @@ -456,12 +456,21 @@ export default { } else if (val === 'move_1') { const obj = { name: '前工位光电信号', value: data[val] } this.arr.push(obj) + } else if (val === 'open') { + const obj = { name: '开到位', value: data[val] } + this.arr.push(obj) + } else if (val === 'close') { + const obj = { name: '关到位', value: data[val] } + this.arr.push(obj) } else if (val === 'phase') { const obj = { name: 'AGV交互阶段', value: data[val] } this.arr.push(obj) } else if (val === 'option') { const obj = { name: 'AGV动作', value: data[val] } this.arr.push(obj) + } else if (val === 'agv_power') { + const obj = { name: 'AGV电量', value: data[val] } + this.arr.push(obj) } else if (val === 'move_2') { const obj = { name: '后工位光电信号', value: data[val] } this.arr.push(obj)