diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java
index dd1233a..a5fe607 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java
@@ -1,7 +1,6 @@
 package org.nl.wms.sch.tasks.callEmpty;
 
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -20,6 +19,7 @@ import org.nl.wms.sch.manage.AbstractAcsTask;
 import org.nl.wms.sch.manage.TaskStatusEnum;
 import org.nl.wms.sch.tasks.AcsTaskDto;
 import org.nl.wms.sch.tasks.RegionTypeEnum;
+import org.nl.wms.util.IdUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -142,7 +142,7 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
                 pointTab.update(jsonStart);
 
                 // 更新终点（叠盘架状态）
-                jsonEnd.put("vehicle_qty", NumberUtil.add(jsonEnd.getString("vehicle_qty"),jsonTask.getString("vehicle_qty")));
+                jsonEnd.put("vehicle_qty", NumberUtil.add(jsonEnd.getString("vehicle_qty"), jsonTask.getString("vehicle_qty")));
                 jsonEnd.put("lock_type", "1");
                 jsonEnd.put("point_status", "2");
                 jsonEnd.put("vehicle_type", jsonTask.getString("vehicle_type"));
@@ -156,9 +156,9 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
             } else {
                 // 终点在供给线线: 更新起点（叠盘架）数量
                 JSONObject jsonStart = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0);
-                jsonStart.put("vehicle_qty",NumberUtil.sub(jsonStart.getString("vehicle_qty"),"1"));
+                jsonStart.put("vehicle_qty", NumberUtil.sub(jsonStart.getString("vehicle_qty"), "1"));
                 jsonStart.put("lock_type", "1");
-                if (StrUtil.equals(jsonStart.getString("vehicle_qty"),"0")) {
+                if (StrUtil.equals(jsonStart.getString("vehicle_qty"), "0")) {
                     jsonStart.put("point_status", "1");
                     jsonStart.put("vehicle_type", "");
                 }
@@ -213,6 +213,8 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
                             .task_id(org.nl.wms.util.IdUtil.getLongId())
                             .task_code(CodeUtil.getNewCode("TASK_CODE"))
                             .task_type("")
+                            .acs_task_type("2")
+                            .task_name("暂存位->叠盘架空载具")
                             .task_status(TaskStatusEnum.START_AND_POINT.getCode())
                             .point_code1(jsonZcKtp.getString("point_code"))
                             .point_code2(jsonDpjStart2.getString("point_code"))
@@ -242,12 +244,14 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
                     if (ObjectUtil.isEmpty(jsonStartPoint)) continue;
 
                     // 判断找到的空载具点位是否是等待点
-                    if (StrUtil.equals(jsonEmpWait.getString("point_code"),jsonStartPoint.getString("point_code"))) {
+                    if (StrUtil.equals(jsonEmpWait.getString("point_code"), jsonStartPoint.getString("point_code"))) {
                         // 创建 养生A区空载具等待点 --> 叠盘架
                         SchTaskDto dto = SchTaskDto.builder()
-                                .task_id(org.nl.wms.util.IdUtil.getLongId())
+                                .task_id(IdUtil.getLongId())
                                 .task_code(CodeUtil.getNewCode("TASK_CODE"))
                                 .task_type("")
+                                .acs_task_type("2")
+                                .task_name("养生A区-> 叠盘架空载具")
                                 .task_status(TaskStatusEnum.START_AND_POINT.getCode())
                                 .point_code1(jsonStartPoint.getString("point_code"))
                                 .point_code2(jsonDpjStart2.getString("point_code"))
@@ -271,6 +275,8 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
                                     .task_id(org.nl.wms.util.IdUtil.getLongId())
                                     .task_code(CodeUtil.getNewCode("TASK_CODE"))
                                     .task_type("")
+                                    .acs_task_type("3")
+                                    .task_name("养生A区>叠盘架空载具")
                                     .task_status(TaskStatusEnum.START_AND_POINT.getCode())
                                     .point_code1(jsonStartPoint.getString("point_code"))
                                     .point_code2(jsonDpjStart2.getString("point_code"))
@@ -287,7 +293,7 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
                             jsonStartPoint.put("lock_type", "2");
                             pointTab.update(jsonStartPoint);
                             // 锁等待点
-                            jsonEmpWait.put("lock_type","2");
+                            jsonEmpWait.put("lock_type", "2");
                             pointTab.update(jsonEmpWait);
                         } else {
                             continue;
@@ -323,20 +329,20 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
         SchTaskDto dto = SchTaskDto.builder().task_id(org.nl.wms.util.IdUtil.getLongId())
                 .task_code(CodeUtil.getNewCode("TASK_CODE"))
                 .task_type("")
+                .task_name("共挤线叫空载具")
                 .task_status(TaskStatusEnum.SURE_END.getCode())
                 .point_code2(point_code2)
                 .vehicle_code(form.getString("vehicle_code"))
                 .vehicle_type(workOrderObj.getString("vehicle_type"))
                 .vehicle_qty(form.getIntValue("qty"))
-                .task_group_id(org.nl.wms.util.IdUtil.getLongId())
+                .task_group_id(IdUtil.getLongId())
                 .handle_class(THIS_CLASS)
                 .create_time(DateUtil.now())
                 .build();
         JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
         taskTab.insert(json);
 
-        this.findStartPoint();
-//        this.immediateNotifyAcs();
+        this.immediateNotifyAcs();
         return String.valueOf(dto.getTask_id());
     }
 
@@ -357,16 +363,24 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
         /*
          * 下发给ACS时需要特殊处理
          */
-        JSONArray arr = WQLObject.getWQLObject("SCH_BASE_Task").query("handle_class = '"+THIS_CLASS+"' and task_status = '"+TaskStatusEnum.START_AND_POINT.getCode()+"' and is_delete ='0'").getResultJSONArray(0);
+        JSONArray arr = WQLObject.getWQLObject("SCH_BASE_Task").query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0'").getResultJSONArray(0);
 
         ArrayList<AcsTaskDto> resultList = new ArrayList<>();
         for (int i = 0; i < arr.size(); i++) {
             JSONObject json = arr.getJSONObject(i);
+
+            String point_code1 = json.getString("point_code1");
+            //判断起点是否属于养生A区
+            if (point_code1.startsWith("2")) {
+                //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1)
+                point_code1 = point_code1.substring(0, 4) + "1" + point_code1.substring(4, 9);
+            }
+
             AcsTaskDto dto = AcsTaskDto.builder()
                     .task_id(json.getString("task_id"))
                     .task_code(json.getString("task_code"))
                     .task_type(json.getString("acs_task_type"))
-                    .start_device_code(json.getString("point_code1"))
+                    .start_device_code(point_code1)
                     .next_device_code(json.getString("point_code3"))
                     .vehicle_code(json.getString("vehicle_code"))
                     .vehicle_type(json.getString("vehicle_type"))
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java
index 91b5d58..4bdcb9d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java
@@ -1,7 +1,6 @@
 package org.nl.wms.sch.tasks.callEmpty;
 
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -15,20 +14,14 @@ import org.nl.modules.common.utils.SecurityUtils;
 import org.nl.modules.system.util.CodeUtil;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
-import org.nl.modules.wql.util.SpringContextHolder;
-import org.nl.wms.pdm.service.DeviceService;
-import org.nl.wms.pdm.service.dto.DeviceDto;
 import org.nl.wms.sch.SchTaskDto;
 import org.nl.wms.sch.manage.AbstractAcsTask;
 import org.nl.wms.sch.manage.TaskStatusEnum;
-import org.nl.wms.sch.service.PointService;
-import org.nl.wms.sch.service.dto.PointDto;
 import org.nl.wms.sch.tasks.AcsTaskDto;
 import org.nl.wms.sch.tasks.RegionTypeEnum;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -225,6 +218,8 @@ public class YqxCallEmpVehicleTask extends AbstractAcsTask {
                             .task_id(org.nl.wms.util.IdUtil.getLongId())
                             .task_code(CodeUtil.getNewCode("TASK_CODE"))
                             .task_type("")
+                            .acs_task_type("2")
+                            .task_name("暂存位>叠盘架空载具")
                             .task_status(TaskStatusEnum.START_AND_POINT.getCode())
                             .point_code1(jsonZcKtp.getString("point_code"))
                             .point_code2(jsonDpjStart2.getString("point_code"))
@@ -260,6 +255,8 @@ public class YqxCallEmpVehicleTask extends AbstractAcsTask {
                                 .task_id(org.nl.wms.util.IdUtil.getLongId())
                                 .task_code(CodeUtil.getNewCode("TASK_CODE"))
                                 .task_type("")
+                                .acs_task_type("2")
+                                .task_name("养生A区>叠盘架空载具")
                                 .task_status(TaskStatusEnum.START_AND_POINT.getCode())
                                 .point_code1(jsonStartPoint.getString("point_code"))
                                 .point_code2(jsonDpjStart2.getString("point_code"))
@@ -283,6 +280,8 @@ public class YqxCallEmpVehicleTask extends AbstractAcsTask {
                                     .task_id(org.nl.wms.util.IdUtil.getLongId())
                                     .task_code(CodeUtil.getNewCode("TASK_CODE"))
                                     .task_type("")
+                                    .acs_task_type("3")
+                                    .task_name("养生A区>叠盘架空载具")
                                     .task_status(TaskStatusEnum.START_AND_POINT.getCode())
                                     .point_code1(jsonStartPoint.getString("point_code"))
                                     .point_code2(jsonDpjStart2.getString("point_code"))
@@ -335,6 +334,7 @@ public class YqxCallEmpVehicleTask extends AbstractAcsTask {
         SchTaskDto dto = SchTaskDto.builder().task_id(org.nl.wms.util.IdUtil.getLongId())
                 .task_code(CodeUtil.getNewCode("TASK_CODE"))
                 .task_type("")
+                .task_name("油漆线叫空载具")
                 .task_status(TaskStatusEnum.SURE_END.getCode())
                 .point_code2(point_code2)
                 .vehicle_code(form.getString("vehicle_code"))
@@ -347,8 +347,7 @@ public class YqxCallEmpVehicleTask extends AbstractAcsTask {
         JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
         taskTab.insert(json);
 
-        this.findStartPoint();
-//        this.immediateNotifyAcs();
+        this.immediateNotifyAcs();
         return String.valueOf(dto.getTask_id());
     }
 
@@ -375,11 +374,18 @@ public class YqxCallEmpVehicleTask extends AbstractAcsTask {
         ArrayList<AcsTaskDto> resultList = new ArrayList<>();
         for (int i = 0; i < arr.size(); i++) {
             JSONObject json = arr.getJSONObject(i);
+            String point_code1 = json.getString("point_code1");
+            //判断起点是否属于养生A区
+            if (point_code1.startsWith("2")) {
+                //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1)
+                point_code1 = point_code1.substring(0, 4) + "1" + point_code1.substring(4, 9);
+            }
+
             AcsTaskDto dto = AcsTaskDto.builder()
                     .task_id(json.getString("task_id"))
                     .task_code(json.getString("task_code"))
                     .task_type(json.getString("acs_task_type"))
-                    .start_device_code(json.getString("point_code1"))
+                    .start_device_code(point_code1)
                     .next_device_code(json.getString("point_code3"))
                     .vehicle_code(json.getString("vehicle_code"))
                     .vehicle_type(json.getString("vehicle_type"))
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YqxCallMaterial.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YqxCallMaterial.java
index 81f92bd..33e1f60 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YqxCallMaterial.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YqxCallMaterial.java
@@ -195,11 +195,15 @@ public class YqxCallMaterial extends AbstractAcsTask {
         ArrayList<AcsTaskDto> acsTaskArr = new ArrayList<>();
         for (int i = 0; i < arr.size(); i++) {
             JSONObject json = arr.getJSONObject(i);
+            //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1)
+            String point_code =json.getString("point_code1");
+            String newPoint = point_code.substring(0, 4) + "1" + point_code.substring(4, 9);
+
             AcsTaskDto dto = AcsTaskDto.builder()
                     .task_id(json.getString("task_id"))
                     .task_code(json.getString("task_code"))
                     .task_type(json.getString("acs_task_type"))
-                    .start_device_code(json.getString("point_code1"))
+                    .start_device_code(newPoint)
                     .next_device_code(json.getString("point_code3"))
                     .vehicle_code(json.getString("vehicle_code"))
                     .vehicle_type(json.getString("vehicle_type"))
@@ -231,6 +235,8 @@ public class YqxCallMaterial extends AbstractAcsTask {
                 .task_id(IdUtil.getLongId())
                 .task_code(CodeUtil.getNewCode("TASK_CODE"))
                 .task_type("task_type")
+                .task_name("油漆线叫料")
+                .material_qty(qty)
                 .task_status(TaskStatusEnum.SURE_END.getCode())
                 .point_code2(point_code2)
                 .vehicle_code(vehicle_code)
@@ -291,6 +297,11 @@ public class YqxCallMaterial extends AbstractAcsTask {
         taskObj.put("update_time", DateUtil.now());
         taskTab.update(taskObj);
 
-        return taskObj.getString("point_code3");
+
+        //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1)
+        String point_code =taskObj.getString("point_code3");
+        String newPoint = point_code.substring(0, 4) + "1" + point_code.substring(4, 9);
+
+        return newPoint;
     }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/HtSendEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/HtSendEmpVehicleTask.java
index 412a765..a5bf266 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/HtSendEmpVehicleTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/HtSendEmpVehicleTask.java
@@ -129,6 +129,7 @@ public class HtSendEmpVehicleTask extends AbstractAcsTask {
         SchTaskDto dto = SchTaskDto.builder().task_id(org.nl.wms.util.IdUtil.getLongId())
                 .task_code(CodeUtil.getNewCode("TASK_CODE"))
                 .task_type("")
+                .task_name("电梯送空载具")
                 .task_status(TaskStatusEnum.SURE_START.getCode())
                 .point_code1(point_code1)
                 .vehicle_code(form.getString("vehicle_code"))
@@ -392,7 +393,11 @@ public class HtSendEmpVehicleTask extends AbstractAcsTask {
             jsonEndPoint.put("lock_type", "2");
             pointTab.update(jsonEndPoint);
         }
-
+        //判断点位是否属于养生A区
+        if (point_code.startsWith("2")) {
+            //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1)
+            point_code = point_code.substring(0, 4) + "1" + point_code.substring(4, 9);
+        }
         return point_code;
     }
 
@@ -406,12 +411,21 @@ public class HtSendEmpVehicleTask extends AbstractAcsTask {
         ArrayList<AcsTaskDto> resultList = new ArrayList<>();
         for (int i = 0; i < arr.size(); i++) {
             JSONObject json = arr.getJSONObject(i);
+
+            String point_code3=json.getString("point_code3");
+            //判断终点是否属于养生A区
+            if (point_code3.startsWith("2")) {
+                //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1)
+                point_code3 = point_code3.substring(0, 4) + "1" + point_code3.substring(4, 9);
+            }
+
+
             AcsTaskDto dto = AcsTaskDto.builder()
                     .task_id(json.getString("task_id"))
                     .task_code(json.getString("task_code"))
                     .task_type(json.getString("acs_task_type"))
                     .start_device_code(json.getString("point_code1"))
-                    .next_device_code(json.getString("point_code3"))
+                    .next_device_code(point_code3)
                     .vehicle_code(json.getString("vehicle_code"))
                     .vehicle_type(json.getString("vehicle_type"))
                     .priority(json.getString("priority"))
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/YqxSendEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/YqxSendEmpVehicleTask.java
index 2fc7fb8..4177b9b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/YqxSendEmpVehicleTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/YqxSendEmpVehicleTask.java
@@ -1,7 +1,6 @@
 package org.nl.wms.sch.tasks.sendEmpty;
 
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -11,9 +10,7 @@ import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.modules.common.exception.BadRequestException;
-import org.nl.modules.common.utils.SecurityUtils;
 import org.nl.modules.system.util.CodeUtil;
-import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.wms.sch.SchTaskDto;
 import org.nl.wms.sch.manage.AbstractAcsTask;
@@ -197,7 +194,6 @@ public class YqxSendEmpVehicleTask extends AbstractAcsTask {
     }
 
 
-
     @Override
     public void cancel(String task_id) {
 
@@ -349,7 +345,11 @@ public class YqxSendEmpVehicleTask extends AbstractAcsTask {
             jsonEndPoint.put("lock_type", "2");
             pointTab.update(jsonEndPoint);
         }
-
+        //判断点位是否属于养生A区
+        if (point_code.startsWith("2")) {
+            //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1)
+            point_code = point_code.substring(0, 4) + "1" + point_code.substring(4, 9);
+        }
         return point_code;
     }
 
@@ -358,17 +358,25 @@ public class YqxSendEmpVehicleTask extends AbstractAcsTask {
         /*
          * 下发给ACS时需要特殊处理
          */
-        JSONArray arr = WQLObject.getWQLObject("SCH_BASE_Task").query("handle_class = '"+THIS_CLASS+"' and task_status = '"+TaskStatusEnum.START_AND_POINT.getCode()+"' and is_delete ='0'").getResultJSONArray(0);
+        JSONArray arr = WQLObject.getWQLObject("SCH_BASE_Task").query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0'").getResultJSONArray(0);
 
         ArrayList<AcsTaskDto> resultList = new ArrayList<>();
         for (int i = 0; i < arr.size(); i++) {
             JSONObject json = arr.getJSONObject(i);
+            String point_code3 = json.getString("point_code3");
+            //判断终点是否属于养生A区
+            if (point_code3.startsWith("2")) {
+                //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1)
+                point_code3 = point_code3.substring(0, 4) + "1" + point_code3.substring(4, 9);
+            }
+
+
             AcsTaskDto dto = AcsTaskDto.builder()
                     .task_id(json.getString("task_id"))
                     .task_code(json.getString("task_code"))
                     .task_type(json.getString("task_type"))
                     .start_device_code(json.getString("point_code1"))
-                    .next_device_code(json.getString("point_code3"))
+                    .next_device_code(point_code3)
                     .vehicle_code(json.getString("vehicle_code"))
                     .vehicle_type(json.getString("vehicle_type"))
                     .priority(json.getString("priority"))
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java
index b042d82..6346282 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java
@@ -217,12 +217,16 @@ public class GjxSendMaterialTask extends AbstractAcsTask {
         ArrayList<AcsTaskDto> acsTaskArr = new ArrayList<>();
         for (int i = 0; i < arr.size(); i++) {
             JSONObject json = arr.getJSONObject(i);
+            //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1)
+            String point_code = json.getString("point_code3");
+            String newPoint = point_code.substring(0, 4) + "1" + point_code.substring(4, 9);
+
             AcsTaskDto dto = AcsTaskDto.builder()
                     .task_id(json.getString("task_id"))
                     .task_code(json.getString("task_code"))
                     .task_type(json.getString("acs_task_type"))
                     .start_device_code(json.getString("point_code1"))
-                    .next_device_code(json.getString("point_code3"))
+                    .next_device_code(newPoint)
                     .vehicle_code(json.getString("vehicle_code"))
                     .vehicle_type(json.getString("vehicle_type"))
                     .priority(json.getString("priority"))
@@ -244,11 +248,20 @@ public class GjxSendMaterialTask extends AbstractAcsTask {
         WQLObject workOrderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder");
         //点位基础表【SCH_BASE_Point】
         WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point");
+
+        //任务表【SCH_BASE_Task】
+        WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
+        //判断当前点是否有未完成的任务
+        JSONObject taskObj = taskTab.query("is_delete='0' and point_code1 = '" + point_code1 + "'  and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0);
+        if (ObjectUtil.isNotEmpty(taskObj)) throw new BadRequestException("当前点位" + point_code1 + "存在未完成的任务");
+
         String device_code = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0).getString("device_code");
 
+
         JSONObject workOrderObj = workOrderTab.query("device_code = '" + device_code + "' and order_status = '3' and is_delete ='0'").uniqueResult(0);
         if (ObjectUtil.isEmpty(workOrderObj)) throw new BadRequestException("该设备当前未生产或者已删除");
 
+
         SchTaskDto dto = SchTaskDto.builder()
                 .task_id(IdUtil.getLongId())
                 .task_code(CodeUtil.getNewCode("TASK_CODE"))
@@ -257,6 +270,7 @@ public class GjxSendMaterialTask extends AbstractAcsTask {
                 .task_status(TaskStatusEnum.SURE_START.getCode())
                 .point_code1(point_code1)
                 .vehicle_code(vehicle_code)
+                .material_qty(qty)
                 .material_info_id(workOrderObj.getLong("workorder_id"))
                 .material_id(workOrderObj.getLong("material_id"))
                 .vehicle_type(vehicle_type)
@@ -264,8 +278,7 @@ public class GjxSendMaterialTask extends AbstractAcsTask {
                 .create_time(DateUtil.now())
                 .request_param(whereJson.toJSONString())
                 .build();
-        //任务表【SCH_BASE_Task】
-        WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
+
         JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
         taskTab.insert(json);
 
@@ -315,9 +328,13 @@ public class GjxSendMaterialTask extends AbstractAcsTask {
         taskObj.put("update_time", DateUtil.now());
         taskTab.update(taskObj);
 
+        //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1)
+        String point_code = jsonOnePoint.getString("point_code");
+        String newPoint = point_code.substring(0, 4) + "1" + point_code.substring(4, 9);
+
         // 点位上锁
         jsonOnePoint.put("lock_type", "2");
         pointTab.update(jsonOnePoint);
-        return jsonOnePoint.getString("point_code");
+        return newPoint;
     }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HkxSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HkxSendMaterialTask.java
index 4e966ba..3848674 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HkxSendMaterialTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HkxSendMaterialTask.java
@@ -207,6 +207,13 @@ public class HkxSendMaterialTask extends AbstractAcsTask {
         String vehicle_code = whereJson.getString("vehicle_code");
         String qty = whereJson.getString("qty");
 
+
+        //任务表【SCH_BASE_Task】
+        WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
+        //判断当前点是否有未完成的任务
+        JSONObject taskObj = taskTab.query("is_delete='0' and point_code1 = '" + point_code1 + "'  and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0);
+        if (ObjectUtil.isNotEmpty(taskObj)) throw new BadRequestException("当前点位" + point_code1 + "存在未完成的任务");
+
         //生产工单表【PDM_BD_WorkOrder】
         WQLObject workOrderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder");
         //点位基础表【SCH_BASE_Point】
@@ -221,6 +228,7 @@ public class HkxSendMaterialTask extends AbstractAcsTask {
                 .task_code(CodeUtil.getNewCode("TASK_CODE"))
                 .task_type("task_type")
                 .task_name("豪凯线满料")
+                .material_qty(qty)
                 .task_status(TaskStatusEnum.SURE_START.getCode())
                 .point_code1(point_code1)
                 .vehicle_code(vehicle_code)
@@ -231,8 +239,6 @@ public class HkxSendMaterialTask extends AbstractAcsTask {
                 .create_time(DateUtil.now())
                 .request_param(whereJson.toJSONString())
                 .build();
-        //任务表【SCH_BASE_Task】
-        WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
         JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
         taskTab.insert(json);
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/YqxSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/YqxSendMaterialTask.java
index 9bf6525..e71d70a 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/YqxSendMaterialTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/YqxSendMaterialTask.java
@@ -144,6 +144,14 @@ public class YqxSendMaterialTask extends AbstractAcsTask {
         WQLObject workOrderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder");
         //点位基础表【SCH_BASE_Point】
         WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point");
+
+        //任务表【SCH_BASE_Task】
+        WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
+        //判断当前点是否有未完成的任务
+        JSONObject taskObj = taskTab.query("is_delete='0' and point_code1 = '" + point_code1 + "'  and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0);
+        if (ObjectUtil.isNotEmpty(taskObj)) throw new BadRequestException("当前点位" + point_code1 + "存在未完成的任务");
+
+
         String device_code = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0).getString("device_code");
 
         JSONObject workOrderObj = workOrderTab.query("device_code = '" + device_code + "' and order_status = '3' and is_delete ='0'").uniqueResult(0);
@@ -166,7 +174,6 @@ public class YqxSendMaterialTask extends AbstractAcsTask {
                 .request_param(whereJson.toJSONString())
                 .build();
         //任务表【SCH_BASE_Task】
-        WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task");
         JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
         taskTab.insert(json);
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls
index 6879152..855cacc 100644
Binary files a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls and b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls differ
diff --git a/lms/nladmin-ui/src/views/wms/sch/task/index.vue b/lms/nladmin-ui/src/views/wms/sch/task/index.vue
index 73d49c2..0d37c08 100644
--- a/lms/nladmin-ui/src/views/wms/sch/task/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/task/index.vue
@@ -116,6 +116,7 @@
         <el-table-column v-if="false" prop="task_id" label="任务标识" />
         <el-table-column prop="task_code" label="任务编码" min-width="100" show-overflow-tooltip />
         <el-table-column v-if="false" prop="task_type" label="任务类型" />
+        <el-table-column   prop="acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip/>
         <el-table-column prop="task_ame" label="任务描述" min-width="120" show-overflow-tooltip />
         <el-table-column v-if="false" prop="task_type_name" label="任务类型" min-width="120" show-overflow-tooltip />
         <el-table-column v-if="false" prop="task_status" label="任务状态" />