diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/QueryZDAgvTaskStatus.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/QueryZDAgvTaskStatus.java
index 28cc182..83268c2 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/QueryZDAgvTaskStatus.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/QueryZDAgvTaskStatus.java
@@ -75,7 +75,7 @@ public class QueryZDAgvTaskStatus {
                         instructionService.update(inst);
                     }
                 } else if ("FINISHED".equals(status)) {
-                    if (inst != null){
+                    if (inst != null&&!"3".equals(inst.getInstruction_status())){
                         String startPoint=inst.getStart_point_code();
                         Device start_device = deviceAppService.findDeviceByCode(startPoint);
                         if (start_device.getDeviceDriver() instanceof SiteDeviceDriver) {
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCMLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCMLTask.java
index 18284c4..88eeb27 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCMLTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCMLTask.java
@@ -210,7 +210,10 @@ public class GHCMLTask extends AbstractTask {
         SchBasePoint startPointObj = pointService.getById(startPoint);
         SchBasePoint endPointObj = pointService.getById(endPoint);
         if (ObjectUtil.isNotEmpty(endPointObj)) {
-            SchBaseVehiclematerialgroup vehiclematerialgroup = vehiclematerialgroupService.getById(taskObj.getGroup_id());
+            SchBaseVehiclematerialgroup vehiclematerialgroup = vehiclematerialgroupService.getVehicleGroupInfo(
+                    startPointObj.getVehicle_code(),
+                    startPointObj.getVehicle_type(),
+                    GroupBindMaterialStatusEnum.BOUND.getValue());
             TaskUtils.setGroupUpdateByType(vehiclematerialgroup, taskFinishedType);
             vehiclematerialgroup.setTask_code(taskObj.getTask_code());
             // 设置链路id，使用任务编码