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 36cf8e28a..f0aafc0a1 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 @@ -97,6 +97,7 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements private Date instruction_finished_time = new Date(); private Date instruction_apply_time = new Date(); private int instruction_require_time_out = 3000; + private int require_apply_strangulation_time_out = 4000; String notCreateInstMessage = ""; @@ -436,10 +437,11 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements private void applyEmptyTask(String type, int mode) { Date date = new Date(); if (date.getTime() - this.require_apply_strangulation_time.getTime() - < (long) this.instruction_require_time_out) { + < (long) this.require_apply_strangulation_time_out) { log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); return; } else { + this.require_apply_strangulation_time = date; try { JSONObject param = new JSONObject(); param.put("device_code", device_code); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandarStirageErroEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandarStirageErroEnum.java index d9e033b7a..5ef467f81 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandarStirageErroEnum.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandarStirageErroEnum.java @@ -6,13 +6,13 @@ import lombok.Getter; @Getter @AllArgsConstructor public enum StandarStirageErroEnum { - FILL("1", "入库货位满"), + FILL("1", "入库货位满"),//申请新点位 - VOIDANCE("2", "出库货位空"), + VOIDANCE("2", "出库货位空"),//人工处理 - BLOCK_OUT("3", "取货潜货位阻挡"), + BLOCK_OUT("3", "取货潜货位阻挡"),//上位先分配移库任务 - BLOCK_IN("4", "放货潜货位阻挡"); + BLOCK_IN("4", "放货潜货位阻挡");//申请点位 /** * 索引 */ diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java index 410964b35..96235dc09 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java @@ -537,7 +537,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i if (startdevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver) { hongXiangConveyorDeviceDriver = (HongXiangConveyorDeviceDriver) startdevice.getDeviceDriver(); if (hongXiangConveyorDeviceDriver.getMode() == 0 || hongXiangConveyorDeviceDriver.getMove() == 0) { - notCreateInstMessage = "就绪任务未创建指令原因->取货位-烘箱:" + hongXiangConveyorDeviceDriver.getDevice_code() + "光电无货,无法生成指令!"; + notCreateInstMessage = "就绪任务未创建指令原因->取货位-烘箱:" + hongXiangConveyorDeviceDriver.getDevice_code() + "光电无货或者脱机,无法生成指令!"; return false; } } @@ -545,7 +545,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i if (nextdevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver) { hongXiangConveyorDeviceDriver = (HongXiangConveyorDeviceDriver) nextdevice.getDeviceDriver(); if (hongXiangConveyorDeviceDriver.getMode() == 0 || hongXiangConveyorDeviceDriver.getMove() == 1) { - notCreateInstMessage = "就绪任务未创建指令原因->放货位-烘箱:" + hongXiangConveyorDeviceDriver.getDevice_code() + "光电有货,无法生成指令!"; + notCreateInstMessage = "就绪任务未创建指令原因->放货位-烘箱:" + hongXiangConveyorDeviceDriver.getDevice_code() + "光电有货或者脱机,无法生成指令!"; return false; } } 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 e3bf8f495..3357bf14c 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 @@ -434,7 +434,7 @@ public class PlugPullDeviceSiteDeviceDriver extends AbstractOpcDeviceDriver impl Map map = new LinkedHashMap<>(); map.put("to_command", 99); this.writing(map); - requireSucess = true; + requireSucess = false; message = "申请套管失败"; LuceneLogDto logDto1 = LuceneLogDto.builder() .device_code(device_code) @@ -495,7 +495,7 @@ public class PlugPullDeviceSiteDeviceDriver extends AbstractOpcDeviceDriver impl Map map = new LinkedHashMap<>(); map.put("to_command", 99); this.writing(map); - requireSucess = true; + requireSucess = false; message = "套管完成失败"; LuceneLogDto logDto2 = LuceneLogDto.builder() .device_code(device_code) @@ -554,7 +554,7 @@ public class PlugPullDeviceSiteDeviceDriver extends AbstractOpcDeviceDriver impl Map map = new LinkedHashMap<>(); map.put("to_command", 99); this.writing(map); - requireSucess = true; + requireSucess = false; message = "拔轴完成失败"; LuceneLogDto logDto1 = LuceneLogDto.builder() .device_code(device_code) @@ -650,7 +650,7 @@ public class PlugPullDeviceSiteDeviceDriver extends AbstractOpcDeviceDriver impl Map map = new LinkedHashMap<>(); map.put("to_command", 99); this.writing(map); - requireSucess = true; + requireSucess = false; message = "申请拔轴失败"; LuceneLogDto logDto1 = LuceneLogDto.builder() .device_code(device_code) @@ -708,7 +708,7 @@ public class PlugPullDeviceSiteDeviceDriver extends AbstractOpcDeviceDriver impl Map map = new LinkedHashMap<>(); map.put("to_command", 99); this.writing(map); - requireSucess = true; + requireSucess = false; message = "申请行架任务失败"; LuceneLogDto logDto1 = LuceneLogDto.builder() .device_code(device_code) @@ -770,7 +770,7 @@ public class PlugPullDeviceSiteDeviceDriver extends AbstractOpcDeviceDriver impl Map map = new LinkedHashMap<>(); map.put("to_command", 99); this.writing(map); - requireSucess = true; + requireSucess = false; message = "请求密集库出气胀轴，申请行架任务失败"; LuceneLogDto logDto1 = LuceneLogDto.builder() .device_code(device_code) 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 ccc00cacd..ee4392e9c 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 @@ -167,7 +167,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { HttpResponse result2 = null; try { MDC.put(log_file_type, log_type); - log.info("applyTaskToWms-----输入参数{}", param); + log.info("applyTwo-----输入参数{}", param); String wmsurl = paramService.findByCode(AcsConfig.WMSURL).getValue(); AddressDto addressDto = addressService.findByCode("applyTwo"); String url = wmsurl + addressDto.getMethods_url(); @@ -183,7 +183,12 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { log.info("applyTaskToWmsError-----请求异常输出参数{}", msg); //网络不通 } - log.info("applyTaskToWms-----输出参数{}", result2.body()); + log.info("applyTwo-----输出参数{}", result2.body()); + LuceneLogDto luceneLogDto = new LuceneLogDto(4, "applyTwo", String.valueOf(result2.getStatus()), + JSON.toJSONString(param), String.valueOf(result2.body()), "ACS向LMS申请" + + ("1".equals(param.getString("type")) ? "子卷装箱入库任务" : "2".equals(param.getString("type")) ? "空盘入库" : "3".equals(param.getString("type")) ? "空盘出库" : "5".equals(param.getString("type")) ? "木箱入库" : + "6".equals(param.getString("type")) ? "退货入库" : "异常处理位")); + luceneLogService.interfaceExecuteLog(luceneLogDto); return result2; } finally { @@ -265,9 +270,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { type = "error"; } log.info("deviceApplyTwo-----输出参数{}", result2.body()); - LuceneLogDto luceneLogDto = new LuceneLogDto(4,"deviceApplyTwo", String.valueOf(result2.getStatus()), - JSON.toJSONString(param), String.valueOf(result2.body()), "二期发货申请捆扎、贴标"); - luceneLogService.interfaceExecuteLog(luceneLogDto); return result2.body(); } finally { diff --git a/acs2/nladmin-ui/src/views/system/monitor/device/index.vue b/acs2/nladmin-ui/src/views/system/monitor/device/index.vue index 68da16c06..de7271460 100644 --- a/acs2/nladmin-ui/src/views/system/monitor/device/index.vue +++ b/acs2/nladmin-ui/src/views/system/monitor/device/index.vue @@ -698,7 +698,7 @@ export default { const obj = { name: i18n.t('monitor.click.request_success_flag'), value: data[val] } this.arr.push(obj) } else if (val === 'requireActionSucess') { - const obj = { name: i18n.t('monitor.click.delivery_completed'), value: data[val] } + const obj = { name: i18n.t('monitor.click.request_success_flag'), value: data[val] } this.arr.push(obj) } else if (val === 'applySucess') { const obj = { name: 'applySucess', value: data[val] }