diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_manipulator/HfGantryManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_manipulator/HfGantryManipulatorDeviceDriver.java
index 6f02581..3cfd00d 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_manipulator/HfGantryManipulatorDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_manipulator/HfGantryManipulatorDeviceDriver.java
@@ -153,17 +153,17 @@ public class HfGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp
                     if (StrUtil.equals(inst1.getInstruction_status(), "0")) {
                         inst1.setInstruction_status("1");
                         instructionService.update(inst1);
-                        TaskDto taskDto = taskserver.findByCodeFromCache(inst1.getTask_code());
-                        if (ObjectUtil.isNotEmpty(taskDto)) {
-                            if (StrUtil.isNotEmpty(taskDto.getExt_task_id())) {
-                                JSONArray array = new JSONArray();
-                                JSONObject map = new JSONObject();
-                                map.put("task_id", taskDto.getExt_task_id());
-                                map.put("task_status", "1");
-                                array.add(map);
-                                acsToWmsService.feedbackTaskStatusToWms(array);
-                            }
-                        }
+//                        TaskDto taskDto = taskserver.findByCodeFromCache(inst1.getTask_code());
+//                        if (ObjectUtil.isNotEmpty(taskDto)) {
+//                            if (StrUtil.isNotEmpty(taskDto.getExt_task_id())) {
+//                                JSONArray array = new JSONArray();
+//                                JSONObject map = new JSONObject();
+//                                map.put("task_id", taskDto.getExt_task_id());
+//                                map.put("task_status", "1");
+//                                array.add(map);
+//                                acsToWmsService.feedbackTaskStatusToWms(array);
+//                            }
+//                        }
 
                     }
                 }
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_two_rgv/HfTwoRGVDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_two_rgv/HfTwoRGVDeviceDriver.java
index 641cbfb..5ecaf37 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_two_rgv/HfTwoRGVDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_two_rgv/HfTwoRGVDeviceDriver.java
@@ -192,17 +192,17 @@ public class HfTwoRGVDeviceDriver extends AbstractOpcDeviceDriver implements Dev
                     if (StrUtil.equals(inst1.getInstruction_status(), "0")) {
                         inst1.setInstruction_status("1");
                         instructionService.update(inst1);
-                        TaskDto taskDto = taskserver.findByCodeFromCache(inst1.getTask_code());
-                        if (ObjectUtil.isNotEmpty(taskDto)) {
-                            if (StrUtil.isNotEmpty(taskDto.getExt_task_id())) {
-                                JSONArray array = new JSONArray();
-                                JSONObject map = new JSONObject();
-                                map.put("task_id", taskDto.getExt_task_id());
-                                map.put("task_status", "1");
-                                array.add(map);
-                                acsToWmsService.feedbackTaskStatusToWms(array);
-                            }
-                        }
+//                        TaskDto taskDto = taskserver.findByCodeFromCache(inst1.getTask_code());
+//                        if (ObjectUtil.isNotEmpty(taskDto)) {
+//                            if (StrUtil.isNotEmpty(taskDto.getExt_task_id())) {
+//                                JSONArray array = new JSONArray();
+//                                JSONObject map = new JSONObject();
+//                                map.put("task_id", taskDto.getExt_task_id());
+//                                map.put("task_status", "1");
+//                                array.add(map);
+//                                acsToWmsService.feedbackTaskStatusToWms(array);
+//                            }
+//                        }
 
                     }
                 }
@@ -242,17 +242,17 @@ public class HfTwoRGVDeviceDriver extends AbstractOpcDeviceDriver implements Dev
                     if (StrUtil.equals(inst2.getInstruction_status(), "0")) {
                         inst2.setInstruction_status("1");
                         instructionService.update(inst2);
-                        TaskDto taskDto = taskserver.findByCodeFromCache(inst2.getTask_code());
-                        if (ObjectUtil.isNotEmpty(taskDto)) {
-                            if (StrUtil.isNotEmpty(taskDto.getExt_task_id())) {
-                                JSONArray array = new JSONArray();
-                                JSONObject map = new JSONObject();
-                                map.put("task_id", taskDto.getExt_task_id());
-                                map.put("task_status", "1");
-                                array.add(map);
-                                acsToWmsService.feedbackTaskStatusToWms(array);
-                            }
-                        }
+//                        TaskDto taskDto = taskserver.findByCodeFromCache(inst2.getTask_code());
+//                        if (ObjectUtil.isNotEmpty(taskDto)) {
+//                            if (StrUtil.isNotEmpty(taskDto.getExt_task_id())) {
+//                                JSONArray array = new JSONArray();
+//                                JSONObject map = new JSONObject();
+//                                map.put("task_id", taskDto.getExt_task_id());
+//                                map.put("task_status", "1");
+//                                array.add(map);
+//                                acsToWmsService.feedbackTaskStatusToWms(array);
+//                            }
+//                        }
 
                     }
                 }
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
index a2fc0e9..a01901b 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
@@ -285,7 +285,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
             TaskDto task = iterator.next();
             if (task.getStart_device_code().equals(device_code) && StrUtil.equals(task.getTask_status(), "1")) {
                 Instruction instruction = instructionService.findByTaskcodeAndStatus(task.getTask_code());
-                if (ObjectUtil.isNotEmpty(instruction)){
+                if (ObjectUtil.isNotEmpty(instruction)) {
                     list.add(task);
                 }
             }
@@ -562,7 +562,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
         if (!StrUtil.startWith(dto.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) {
             TaskFeedbackDto feefbackdto = taskFeedbackService.findByCode(entity.getTask_code());
             JSONObject feed_jo = new JSONObject();
-            feed_jo.put("task_id", entity.getTask_id());
+            feed_jo.put("task_id", entity.getExt_task_id());
             feed_jo.put("task_code", dto.getTask_code());
             feed_jo.put("task_status", dto.getTask_status());
             JSONArray ja = new JSONArray();