From 56169d938a592443ba455c09e3634caaccfea585 Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Tue, 24 Jun 2025 17:43:10 +0800 Subject: [PATCH] =?UTF-8?q?opt=EF=BC=9A=E5=85=BC=E5=AE=B9=E6=AF=8D?= =?UTF-8?q?=E6=8B=96=E7=9B=98=E4=B8=8D=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ssx_site/SsxSiteDeviceDriver.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/ssx_site/SsxSiteDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/ssx_site/SsxSiteDeviceDriver.java index bb00914..2e30ae5 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/ssx_site/SsxSiteDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/ssx_site/SsxSiteDeviceDriver.java @@ -6,6 +6,7 @@ import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; +import org.nl.acs.AcsConfig; import org.nl.acs.device.domain.Device; import org.nl.acs.device.service.DeviceService; import org.nl.acs.device_driver.DeviceDriver; @@ -22,6 +23,8 @@ import org.nl.acs.route.service.RouteLineService; import org.nl.acs.task.service.TaskService; import org.nl.acs.task.service.mapper.TaskMapper; import org.nl.config.SpringContextHolder; +import org.nl.system.service.param.ISysParamService; +import org.nl.system.service.param.impl.SysParamServiceImpl; import org.openscada.opc.lib.da.Server; import java.util.*; @@ -39,6 +42,8 @@ public class SsxSiteDeviceDriver extends AbstractOpcDeviceDriver implements Devi DeviceService deviceservice = SpringContextHolder.getBean("deviceServiceImpl"); + ISysParamService paramService = SpringContextHolder.getBean(SysParamServiceImpl.class); + RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl"); TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); @@ -303,9 +308,17 @@ public class SsxSiteDeviceDriver extends AbstractOpcDeviceDriver implements Devi this.apply(7); break; case 8: - if (ObjectUtils.isNotEmpty(sub_tray) && ObjectUtils.isNotEmpty(mother_tray)) { - log.info("满料出库"); - this.apply(8); + String electric_end = paramService.findByCode("mother_tray_check").getValue(); + if(ObjectUtils.isNotEmpty(electric_end) && "1".equals(electric_end)){ + if (ObjectUtils.isNotEmpty(sub_tray) && ObjectUtils.isNotEmpty(mother_tray)) { + log.info("满料出库"); + this.apply(8); + } + }else{ + if (ObjectUtils.isNotEmpty(sub_tray)) { + log.info("满料出库"); + this.apply(8); + } } break; }