From fb0156bc729dc1a2da5821b7fe71e1c743655926 Mon Sep 17 00:00:00 2001 From: ls <1793460677@qq.com> Date: Wed, 23 Apr 2025 17:16:07 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=EF=BC=9A=20=E6=B5=8B=E8=AF=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StandardInspectSite2DeviceDriver.java | 2 +- .../org/nl/start/auto/run/NDCSocketConnectionAutoRun.java | 6 ++++++ acs/hd/nladmin-system/src/main/resources/logback-spring.xml | 6 ------ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site2/StandardInspectSite2DeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site2/StandardInspectSite2DeviceDriver.java index 4af6b9c..4efe9a1 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site2/StandardInspectSite2DeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_inspect_site2/StandardInspectSite2DeviceDriver.java @@ -266,7 +266,7 @@ public class StandardInspectSite2DeviceDriver extends AbstractOpcDeviceDriver im dto.setNext_device_code(endDevice.getDevice_code()); dto.setTask_code("-" + taskcode); dto.setTask_status("0"); - dto.setPriority("101"); + dto.setPriority("1"); // RouteLineDto jo = routelineserver.findByCode(this.getDevice().getDevice_code()); // String next_device_codecode = jo.getNext_device_code(); // if(StrUtil.isEmpty(next_device_codecode)){ diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java b/acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java index afde077..3c214dd 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java @@ -400,6 +400,12 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { if (StrUtil.equals(acsConfigService.findConfigFromCache().get(AcsConfig.IGNOREHASGOODS), "1")) { inst.setExecute_status("5"); instructionService.update(inst); + String nextPointCode = inst.getNext_point_code(); + Device nextDevice = deviceAppService.findDeviceByCode(nextPointCode); + if (nextDevice.getDeviceDriver() instanceof StandardInspectSite2DeviceDriver){ + standardInspectSite2DeviceDriver = (StandardInspectSite2DeviceDriver) device.getDeviceDriver(); + standardInspectSite2DeviceDriver.writing(2); + } data = AgvService.sendAgvOneModeInst(phase, index, 0); flag = true; JSONObject jo = new JSONObject(); diff --git a/acs/hd/nladmin-system/src/main/resources/logback-spring.xml b/acs/hd/nladmin-system/src/main/resources/logback-spring.xml index d15f449..9bd5afe 100644 --- a/acs/hd/nladmin-system/src/main/resources/logback-spring.xml +++ b/acs/hd/nladmin-system/src/main/resources/logback-spring.xml @@ -68,14 +68,8 @@ https://juejin.cn/post/6844903775631572999 - - - - - -