diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java
index 2914d6faa..51c4e14fc 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java
@@ -800,9 +800,10 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
      */
     private void verifyPoint(String type,JSONObject jo) {
         Instruction instruction = checkInst();
+        String[] point_codes = jo.getString("point_code").split("-");
         if (type.equals(StandarStirageErroEnum.BLOCK_IN.getType()) || type.equals(StandarStirageErroEnum.FILL.getType())) {
             List<RouteLineDto> routeLineDtos = routeLineService.getShortPathLines(instruction.getStart_device_code(),
-                    jo.getString("point_code"), instruction.getRoute_plan_code());
+                    point_codes[0], instruction.getRoute_plan_code());
             if(CollUtil.isEmpty(routeLineDtos)){
                 errorPoint(jo, instruction);
             }
@@ -812,7 +813,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
                 errorPoint(jo, instruction);
             }
         } else if(type.equals(StandarStirageErroEnum.VOIDANCE.getType())){
-            List<RouteLineDto> routeLineDtos = routeLineService.getShortPathLines(jo.getString("point_code"),instruction.getNext_device_code(),
+            List<RouteLineDto> routeLineDtos = routeLineService.getShortPathLines(point_codes[0],instruction.getNext_device_code(),
                      instruction.getRoute_plan_code());
             if(CollUtil.isEmpty(routeLineDtos)){
                 errorPoint(jo, instruction);
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
index 1fa3c70a0..1ff3a8f27 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
@@ -247,7 +247,7 @@ public class TaskServiceImpl extends CommonServiceImpl<TaskMapper, Task> impleme
     public Map<String, Object> queryAll(Map whereJson, Pageable page) {
 
         String task_code = (String) whereJson.get("task_code");
-        String vehicle_code = (String) whereJson.get("vehicle_code");
+        String vehicle_code = (String) whereJson.get("vehicle_code2");
         String material_type = (String) whereJson.get("material_type");
         String status = (String) whereJson.get("status");
         String point_code = (String) whereJson.get("point_code");