From fe25998a243812afb327b68f01aa31897210e96a Mon Sep 17 00:00:00 2001 From: yanps Date: Mon, 13 Nov 2023 19:57:46 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20NDC=E5=8F=8C=E5=B7=A5=E4=BD=8DAGV?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agv/ndctwo/AgvNdcTwoDeviceDriver.java | 16 ++++++++++++++-- .../StandardOrdinarySiteDeviceDriver.java | 2 ++ .../wms/service/impl/WmsToAcsServiceImpl.java | 2 ++ .../org/nl/modules/security/rest/DesUtil.java | 2 ++ 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDeviceDriver.java index 8185c3c2b..6948788e5 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDeviceDriver.java @@ -215,12 +215,18 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver(); - if (ObjectUtil.isNotEmpty(this.device.getExtraValue().get("wait")) - && StrUtil.equals("true", this.device.getExtraValue().get("wait").toString()) + if (ObjectUtil.isNotEmpty(device.getExtraValue().get("wait")) + && StrUtil.equals("true", device.getExtraValue().get("wait").toString()) && StrUtil.equals(task.getTask_type(), "1")) { // if (standardOrdinarySiteDeviceDriver.getOption() == 1) { data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); + String task_code = standardOrdinarySiteDeviceDriver.getTask_code(); + if(!task_code.equals(task.getTask_code())){ + log.info("等待LMS系统进行确认允许取货，设备号{},指令号{},任务号{}", device_code, ikey,task.getTask_code()); + message = "等待LMS系统进行确认允许取货,设备号:" + device_code + ",指令号:" + ikey; + logServer.deviceExecuteLog(this.device_code, "", "", "等待LMS系统进行确认允许取货,设备号" + device.getDevice_code() + ",指令号" + ikey); + } } else { log.info("等待LMS系统进行确认允许取货，设备号{},指令号{}", device_code, ikey); message = "等待LMS系统进行确认允许取货,设备号:" + device_code + ",指令号:" + ikey; @@ -366,6 +372,12 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic if (standardOrdinarySiteDeviceDriver.getOption() == 1) { standardOrdinarySiteDeviceDriver.setAgvphase(0); data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); + String task_code = standardOrdinarySiteDeviceDriver.getTask_code(); + if(!task_code.equals(task.getTask_code())){ + log.info("等待LMS系统进行确认允许取货，设备号{},指令号{},任务号{}", device_code, ikey,task.getTask_code()); + message = "等待LMS系统进行确认允许取货,设备号:" + device_code + ",指令号:" + ikey; + logServer.deviceExecuteLog(this.device_code, "", "", "等待LMS系统进行确认允许取货,设备号" + device.getDevice_code() + ",指令号" + ikey); + } } else { log.info("等待LMS系统进行确认允许取货，设备号{},指令号{}", device_code, ikey); message = "等待LMS系统进行确认允许取货,设备号:" + device_code + ",指令号:" + ikey; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java index 9d27b1983..3f5b67d48 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java @@ -78,6 +78,8 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple Instruction inst = null; //上次指令 Instruction last_inst = null; + //任务号 + String task_code; boolean requireSucess = false; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index 7c6469602..49e0d7173 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -1092,10 +1092,12 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { if (device_k.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device_k.getDeviceDriver(); standardOrdinarySiteDeviceDriver.setOption(Integer.parseInt(option)); + standardOrdinarySiteDeviceDriver.setTask_code(task_code); } if (device_m.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device_m.getDeviceDriver(); standardOrdinarySiteDeviceDriver.setOption(Integer.parseInt(option)); + standardOrdinarySiteDeviceDriver.setTask_code(task_code); } } else { JSONObject jo = new JSONObject(); diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/security/rest/DesUtil.java b/acs/nladmin-system/src/main/java/org/nl/modules/security/rest/DesUtil.java index 89f9a3248..15a78ab55 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/security/rest/DesUtil.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/security/rest/DesUtil.java @@ -6,6 +6,8 @@ package org.nl.modules.security.rest; // + + import sun.misc.BASE64Decoder; import sun.misc.BASE64Encoder;