From dfcaeea73132225c7028be6b361a68c93a8230a3 Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Wed, 11 Jun 2025 16:44:54 +0800 Subject: [PATCH] =?UTF-8?q?add:=E5=A5=97=E7=AE=A1=E5=AE=8C=E6=88=90,?= =?UTF-8?q?=E9=87=8D=E9=87=8F=E4=B8=BA0=EF=BC=8C=E4=B8=8D=E5=8F=8D?= =?UTF-8?q?=E9=A6=88LMS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/acs/AcsConfig.java | 5 +++++ ...lumeTwoManipulatorManipulatorDeviceDriver.java | 2 +- .../PlugPullDeviceSiteDeviceDriver.java | 15 +++++++++++++-- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/AcsConfig.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/AcsConfig.java index 0d1e78051..b57e4dabf 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/AcsConfig.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/AcsConfig.java @@ -78,6 +78,11 @@ public interface AcsConfig { */ String HASWMS = "hasWms"; + /** + * 是否存在wms系统 + */ + String pgErrorSendLms = "pgErrorSendLms"; + /** * 是否请求wms系统 */ diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/volume_two_manipulator/VolumeTwoManipulatorManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/volume_two_manipulator/VolumeTwoManipulatorManipulatorDeviceDriver.java index 82ea2efaf..0f558c905 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/volume_two_manipulator/VolumeTwoManipulatorManipulatorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/volume_two_manipulator/VolumeTwoManipulatorManipulatorDeviceDriver.java @@ -262,7 +262,7 @@ public class VolumeTwoManipulatorManipulatorDeviceDriver extends AbstractOpcDevi this.iserror = true; LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) - .content(this.device_code + "读取信号值时出现异常:" + var17.getMessage() + ",this.itemProtocol is null") + .content(this.device_code + "读取信号值时出现异常:" + Arrays.toString(var17.getStackTrace()) + ",this.itemProtocol is null") .build(); logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); 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 49fcd1a30..cdf1db538 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 @@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONObject; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.acs.AcsConfig; import org.nl.acs.agv.server.AgvService; import org.nl.acs.common.base.CommonFinalParam; import org.nl.acs.device.domain.Device; @@ -481,6 +482,16 @@ public class PlugPullDeviceSiteDeviceDriver extends AbstractOpcDeviceDriver impl return; } else { this.bushingSucess_time = date; + if (StrUtil.equals(paramService.findByCode(AcsConfig.pgErrorSendLms).getValue(), CommonFinalParam.ONE)){ + if (weight1 == 0 && weight2 == 0) { + Map map = new LinkedHashMap<>(); + map.put("to_command", 99); + this.writing(map); + requireSucess = false; + message = "套管完成失败,重量为0"; + } + } + ApplyPlugPullSiteRequest applyPlugPullSiteRequest = new ApplyPlugPullSiteRequest(); ApplyPlugPullSitResponse applyPlugPullSitResponse; applyPlugPullSiteRequest.setDevice_code(device_code); @@ -495,8 +506,8 @@ public class PlugPullDeviceSiteDeviceDriver extends AbstractOpcDeviceDriver impl param.put("type", CommonFinalParam.TYPE_TWO); param.put("weight1", String.valueOf(weight1)); param.put("material1", String.valueOf(material1)); - param.put("weight1", String.valueOf(weight1)); - param.put("material1", String.valueOf(material1)); + param.put("weight2", String.valueOf(weight2)); + param.put("material2", String.valueOf(material2)); LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) .content("申请套管完成任务,请求参数:" + param)