opt: NDC双工位AGV优化

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"))
+                if (ObjectUtil.isNotEmpty(device.getExtraValue().get("wait"))
-                        && StrUtil.equals("true", this.device.getExtraValue().get("wait").toString())
+                        && 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;

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;
 

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();

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;