From 864990b446bfa2c1d50c91c7f272f677596fbcd6 Mon Sep 17 00:00:00 2001 From: lishuai <1793460677@qq.com> Date: Thu, 29 Feb 2024 13:13:32 +0800 Subject: [PATCH] =?UTF-8?q?fix=20:=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DeviceServiceImpl.java | 4 ++++ .../BeltConveyorDeviceDriver.java | 23 ++++++++----------- .../StandarStirageErroEnum.java | 2 +- .../StandardStackerDeviceDriver.java | 4 ++-- ...dvice.properties => one_device.properties} | 0 ...properties => one_device_en_US.properties} | 0 ...properties => one_device_in_ID.properties} | 0 ...properties => one_device_zh_CN.properties} | 0 .../views/acs/device/driver/belt_conveyor.vue | 2 +- 9 files changed, 18 insertions(+), 17 deletions(-) rename acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/{one_advice.properties => one_device.properties} (100%) rename acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/{one_advice_en_US.properties => one_device_en_US.properties} (100%) rename acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/{one_advice_in_ID.properties => one_device_in_ID.properties} (100%) rename acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/{one_advice_zh_CN.properties => one_device_zh_CN.properties} (100%) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java index 1d6b070f7..6672871b7 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java @@ -26,6 +26,7 @@ import org.nl.acs.device.enums.DeviceType; import org.nl.acs.device.service.mapper.DeviceExtraMapper; import org.nl.acs.device.domain.DeviceRunpoint; import org.nl.acs.device.service.mapper.DeviceRunpointMapper; +import org.nl.acs.device_driver.conveyor.belt_conveyor.BeltConveyorDeviceDriver; import org.nl.acs.device_driver.one_conveyor.scanner_weight_conveyor.ConveyorWithScannerWeightDeviceDriver; import org.nl.acs.device_driver.one_manipulator.volume_two_manipulator.VolumeTwoManipulatorManipulatorDeviceDriver; import org.nl.acs.device_driver.stacker.standard_stacker.StandardStackerDeviceDriver; @@ -1025,6 +1026,9 @@ public class DeviceServiceImpl extends CommonServiceImpl i }else if (device.getDeviceDriver() instanceof ConveyorWithScannerWeightDeviceDriver) { ConveyorWithScannerWeightDeviceDriver conveyorWithScannerWeightDeviceDriver = (ConveyorWithScannerWeightDeviceDriver) device.getDeviceDriver(); conveyorWithScannerWeightDeviceDriver.setDeviceStatus(form); + }else if (device.getDeviceDriver() instanceof BeltConveyorDeviceDriver) { + BeltConveyorDeviceDriver beltConveyorDeviceDriver = (BeltConveyorDeviceDriver) device.getDeviceDriver(); + beltConveyorDeviceDriver.setDeviceStatus(form); } } 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 8c76e15ff..92a66e345 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 @@ -235,14 +235,9 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements if (mode != last_mode) { - JSONObject param = new JSONObject(); - param.put("device_code", this.device_code); - param.put("mode", Math.min(mode, 3)); - param.put("device_name", this.getDevice().getDevice_name()); - param.put("device_type", CommonFinalParam.ONE); + requireSucess = false; - logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode + "复位请求标记:" + requireSucess); - logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode); + } @@ -680,7 +675,10 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements public JSONObject getDeviceStatusName() { JSONObject jo = new JSONObject(); String mode = ""; - + String requireSucess = "0"; + if (this.requireSucess) { + requireSucess = "1"; + } if (this.getMode() == 0) { mode = LangProcess.msg("universal_off-line"); } else if (this.getMode() == 1) { @@ -695,13 +693,12 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements jo.put("device_name", this.getDevice().getDevice_name()); jo.put("mode", mode); - //jo.put("error", ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(this.getError()))); - jo.put("inventory_qty", inventory_qty); - jo.put("out_finish", out_finish); - jo.put("material", material); + jo.put("message", this.getMessage()); + jo.put("error", this.getError()); + jo.put("move", move); jo.put("is_click", true); jo.put("isOnline", this.getIsonline()); - + jo.put("requireSucess", requireSucess); return jo; } 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 dc0fc70b3..d9e033b7a 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 @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.stacker.standard_stacker; +package org.nl.acs.device_driver.stacker.standard_stacker; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java index 1248744a4..8bc1e1169 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java @@ -319,6 +319,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme storage_cache = this.itemProtocol.getItem_storage_cache(); + // 更新指令状态 if (mode == 3 && task > 0) { Date date = new Date(); @@ -348,7 +349,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme if (mode != 3 || requireSucess) { -// message = LangProcess.msg("one_message7"); + message = LangProcess.msg("one_message7"); } else if (error != 0) { message = LangProcess.msg("universal_message3"); @@ -371,7 +372,6 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme applyUpdatePointCode(StandarStirageErroEnum.BLOCK_IN.getType()); } - } } else { diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_advice.properties b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_device.properties similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_advice.properties rename to acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_device.properties diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_advice_en_US.properties b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_device_en_US.properties similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_advice_en_US.properties rename to acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_device_en_US.properties diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_advice_in_ID.properties b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_device_in_ID.properties similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_advice_in_ID.properties rename to acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_device_in_ID.properties diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_advice_zh_CN.properties b/acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_device_zh_CN.properties similarity index 100% rename from acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_advice_zh_CN.properties rename to acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/one_device/one_device_zh_CN.properties diff --git a/acs2/nladmin-ui/src/views/acs/device/driver/belt_conveyor.vue b/acs2/nladmin-ui/src/views/acs/device/driver/belt_conveyor.vue index b0e4cb7a0..3149a4086 100644 --- a/acs2/nladmin-ui/src/views/acs/device/driver/belt_conveyor.vue +++ b/acs2/nladmin-ui/src/views/acs/device/driver/belt_conveyor.vue @@ -1,5 +1,5 @@