diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_one_rgv/LnshOneRGVDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_one_rgv/LnshOneRGVDeviceDriver.java
index e596796..b239a28 100644
--- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_one_rgv/LnshOneRGVDeviceDriver.java
+++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_one_rgv/LnshOneRGVDeviceDriver.java
@@ -130,55 +130,55 @@ public class LnshOneRGVDeviceDriver extends AbstractOpcDeviceDriver implements D
 
             if (mode != last_mode) {
                 this.setRequireSucess(false);
-                logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode));
-                logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode);
+                logServer.deviceItemValue(this.device_code, "mode", String.valueOf(mode));
+                logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode);
             }
             if (error != last_error) {
-                logServer.deviceItemValue(this.device_code,"error" ,String.valueOf(error));
-                logServer.deviceExecuteLog(this.device_code,"","","信号error：" + last_error + "->" + error);
+                logServer.deviceItemValue(this.device_code, "error", String.valueOf(error));
+                logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
             }
             if (status != last_status) {
-                logServer.deviceItemValue(this.device_code,"status" ,String.valueOf(status));
-                logServer.deviceExecuteLog(this.device_code,"","","信号status：" + last_status + "->" + status);
+                logServer.deviceItemValue(this.device_code, "status", String.valueOf(status));
+                logServer.deviceExecuteLog(this.device_code, "", "", "信号status：" + last_status + "->" + status);
             }
             if (move_1 != last_move_1) {
-                logServer.deviceItemValue(this.device_code,"move_1" ,String.valueOf(move_1));
-                logServer.deviceExecuteLog(this.device_code,"","","信号move_1：" + last_move_1 + "->" + move_1);
+                logServer.deviceItemValue(this.device_code, "move_1", String.valueOf(move_1));
+                logServer.deviceExecuteLog(this.device_code, "", "", "信号move_1：" + last_move_1 + "->" + move_1);
             }
             if (action_1 != last_action_1) {
-                logServer.deviceItemValue(this.device_code,"action_1" ,String.valueOf(action_1));
-                logServer.deviceExecuteLog(this.device_code,"","","信号action_1：" + last_action_1 + "->" + action_1);
+                logServer.deviceItemValue(this.device_code, "action_1", String.valueOf(action_1));
+                logServer.deviceExecuteLog(this.device_code, "", "", "信号action_1：" + last_action_1 + "->" + action_1);
             }
             if (walk_y != last_walk_y) {
-                logServer.deviceItemValue(this.device_code,"walk_y" ,String.valueOf(walk_y));
-                logServer.deviceExecuteLog(this.device_code,"","","信号walk_y：" + last_walk_y + "->" + walk_y);
+                logServer.deviceItemValue(this.device_code, "walk_y", String.valueOf(walk_y));
+                logServer.deviceExecuteLog(this.device_code, "", "", "信号walk_y：" + last_walk_y + "->" + walk_y);
             }
             if (task1 != last_task1) {
-                logServer.deviceItemValue(this.device_code,"task1" ,String.valueOf(task1));
-                logServer.deviceExecuteLog(this.device_code,"","","信号task1：" + last_task1 + "->" + task1);
+                logServer.deviceItemValue(this.device_code, "task1", String.valueOf(task1));
+                logServer.deviceExecuteLog(this.device_code, "", "", "信号task1：" + last_task1 + "->" + task1);
             }
             if (task_qty != last_task_qty) {
-                logServer.deviceItemValue(this.device_code,"task_qty" ,String.valueOf(task_qty));
-                logServer.deviceExecuteLog(this.device_code,"","","信号task_qty：" + last_task_qty + "->" + task_qty);
+                logServer.deviceItemValue(this.device_code, "task_qty", String.valueOf(task_qty));
+                logServer.deviceExecuteLog(this.device_code, "", "", "信号task_qty：" + last_task_qty + "->" + task_qty);
             }
             if (finishTask_qty != last_finishTask_qty) {
-                logServer.deviceItemValue(this.device_code,"finishTask_qty" ,String.valueOf(finishTask_qty));
-                logServer.deviceExecuteLog(this.device_code,"","","信号finishTask_qty：" + last_finishTask_qty + "->" + finishTask_qty);
+                logServer.deviceItemValue(this.device_code, "finishTask_qty", String.valueOf(finishTask_qty));
+                logServer.deviceExecuteLog(this.device_code, "", "", "信号finishTask_qty：" + last_finishTask_qty + "->" + finishTask_qty);
             }
             if (batch != last_batch) {
-                logServer.deviceItemValue(this.device_code,"batch" ,String.valueOf(batch));
-                logServer.deviceExecuteLog(this.device_code,"","","信号batch：" + last_batch + "->" + batch);
+                logServer.deviceItemValue(this.device_code, "batch", String.valueOf(batch));
+                logServer.deviceExecuteLog(this.device_code, "", "", "信号batch：" + last_batch + "->" + batch);
             }
             if (qty != last_qty) {
-                logServer.deviceItemValue(this.device_code,"qty" ,String.valueOf(qty));
-                logServer.deviceExecuteLog(this.device_code,"","","信号qty：" + last_qty + "->" + qty);
+                logServer.deviceItemValue(this.device_code, "qty", String.valueOf(qty));
+                logServer.deviceExecuteLog(this.device_code, "", "", "信号qty：" + last_qty + "->" + qty);
             }
-            if (!StrUtil.equals(specifications,last_specifications)) {
-                logServer.deviceItemValue(this.device_code,"specifications" ,specifications);
-                logServer.deviceExecuteLog(this.device_code,"","","信号specifications：" + last_specifications + "->" + specifications);
+            if (!StrUtil.equals(specifications, last_specifications)) {
+                logServer.deviceItemValue(this.device_code, "specifications", specifications);
+                logServer.deviceExecuteLog(this.device_code, "", "", "信号specifications：" + last_specifications + "->" + specifications);
             }
 
-            if ( action_1 == 1 && move_1 != 0 && task1 > 0) {
+            if (action_1 == 1 && move_1 != 0 && task1 > 0) {
                 //inst_message
                 inst = instructionService.findByCodeFromCache(String.valueOf(task1));
                 if (inst != null) {
@@ -189,7 +189,7 @@ public class LnshOneRGVDeviceDriver extends AbstractOpcDeviceDriver implements D
                 }
 
             }
-            if ( action_1 == 4 && task1 > 0) {
+            if (action_1 == 4 && task1 > 0) {
                 //inst_message
                 inst = instructionService.findByCodeFromCache(String.valueOf(task1));
                 if (inst != null) {
@@ -230,7 +230,7 @@ public class LnshOneRGVDeviceDriver extends AbstractOpcDeviceDriver implements D
                     log.debug("设备运转模式:等待工作");
                     return;
                 case 2:
-                    if (mode == 2 && move_1 == 0 && action_1 == 0  && !requireSucess) {
+                    if (mode == 2 && move_1 == 0 && action_1 == 0 && !requireSucess) {
                         instruction_require();
                     }
                     break;
@@ -302,11 +302,12 @@ public class LnshOneRGVDeviceDriver extends AbstractOpcDeviceDriver implements D
         ReadUtil.write(itemMap, server);
 
     }
+
     public void executing(Server server, Map<String, Object> itemMap) {
         ReadUtil.write(itemMap, server);
     }
 
-    public void writing(String type,String value) {
+    public void writing(String type, String value) {
         String to_command1 = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
                 + "." + ItemProtocol.item_to_command1;
 
@@ -318,6 +319,18 @@ public class LnshOneRGVDeviceDriver extends AbstractOpcDeviceDriver implements D
 
     }
 
+    public void writing(int command) {
+        String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+                + "." + ItemProtocol.item_to_command1;
+
+        String opcservcerid = this.getDevice().getOpc_server_id();
+        Server server = ReadUtil.getServer(opcservcerid);
+        Map<String, Object> itemMap = new HashMap<String, Object>();
+        itemMap.put(to_command, command);
+        ReadUtil.write(itemMap, server);
+
+    }
+
     public synchronized boolean finish_instruction() throws Exception {
         instructionService.finish(inst);
         return true;
@@ -331,14 +344,16 @@ public class LnshOneRGVDeviceDriver extends AbstractOpcDeviceDriver implements D
             return false;
         } else {
             this.instruction_apply_time = date;
-            String linkobj = (String)this.getDevice().getExtraValue().get("get_device_code");
-            String demosub = linkobj.substring(1,linkobj.length()-1);
+            String linkobj = (String) this.getDevice().getExtraValue().get("get_device_code");
+            String demosub = linkobj.substring(1, linkobj.length() - 1);
             String demoArray[] = demosub.split(",");
             List<String> device_code_list = Arrays.asList(demoArray);
             TaskDto task = null;
-            for(int i=0;i<device_code_list.size();i++){
-                task = taskserver.queryTaskByDeviceCode(device_code_list.get(i).replace("\"","")).get(0);
-                if(ObjectUtil.isNotEmpty(task)) break;
+            for (int i = 0; i < device_code_list.size(); i++) {
+                if (ObjectUtil.isNotEmpty(taskserver.queryTaskByDeviceCode(device_code_list.get(i).replace("\"", "")))) {
+                    task = taskserver.queryTaskByDeviceCode(device_code_list.get(i).replace("\"", "")).get(0);
+                }
+                if (ObjectUtil.isNotEmpty(task)) break;
             }
             if (!ObjectUtil.isEmpty(task)) {
                 String taskid = task.getTask_id();
@@ -385,16 +400,16 @@ public class LnshOneRGVDeviceDriver extends AbstractOpcDeviceDriver implements D
                 //创建指令后修改任务状态
                 task.setTask_status("1");
                 taskserver.update(task);
-                requireSucess = false;
+                requireSucess = true;
 
 
-                String start_addr = startdevice.getAddress();
-                String next_addr = nextdevice.getAddress();
+                String start_addr = startdevice.getExtraValue().get("OPCServer").toString();
+                String next_addr = nextdevice.getExtraValue().get("OPCServer").toString();
 
-                writing("to_command1","1");
-                writing("item_to_onset1",start_addr);
-                writing("item_to_target1",next_addr);
-                writing("item_to_task1",instdto.getInstruction_code());
+                writing(1);
+                writing("RGV1.RGV1.RGV1.to_onset1", start_addr);
+                writing("RGV1.RGV1.RGV1.to_target1", next_addr);
+                writing("RGV1.RGV1.RGV1.to_task1", instdto.getInstruction_code());
 
 
             } else {
diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
index 83b199f..1e5ea59 100644
--- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
+++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
@@ -187,7 +187,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                 //叫空托盘
                 jsonObject.put("next_point_code", device_code);
                 //如果是叠盘位3 ，则去铁托盘缓存区取
-                if (!StrUtil.equals(device_code,"KTPHCW3")){
+                if (StrUtil.equals(device_code,"KTPDDW3")){
                     //1 更新缓存位
                     JSONArray pointarr = WQL.getWO("ACSTOMES_001").addParam("area_type", AreaEnum.KTTHCQ.getCode()).addParam("flag", "4").process().getResultJSONArray(0);
                     PointUpdateUtil.updatePoint(pointarr);
diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/ACSTOMES_001.wql b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/ACSTOMES_001.wql
index 8de73b7..135cda5 100644
--- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/ACSTOMES_001.wql
+++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/ACSTOMES_001.wql
@@ -76,6 +76,7 @@
     IF 输入.flag = "2"
        	QUERY
        		SELECT
+       		    DISTINCT
             	point.point_id,
             	point.point_code,
             	point.point_name,