diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/AgvWaitUtil.java b/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/AgvWaitUtil.java
index 97374f3..974f2e7 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/AgvWaitUtil.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/AgvWaitUtil.java
@@ -10,19 +10,21 @@ import org.nl.acs.opc.Device;
 import org.nl.acs.opc.DeviceAppService;
 import org.nl.acs.task.service.dto.TaskDto;
 import org.nl.modules.common.exception.BadRequestException;
-import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 /**
  * @author zhangjiangwei
  */
-@Service
+@Component
 @RequiredArgsConstructor
 @Slf4j
 public class AgvWaitUtil {
 
-    private final DeviceAppService deviceAppService;
-
-    private final DeviceExecuteLogService deviceExecuteLogService;
+    @Autowired
+    private DeviceAppService deviceAppService;
+    @Autowired
+    private DeviceExecuteLogService deviceExecuteLogService;
 
     //取货前等待
     public JSONObject waitInGet(String deviceCode) {
@@ -107,7 +109,6 @@ public class AgvWaitUtil {
         }
 
         if (device.getDeviceDriver() instanceof PhotoelectricDetectionDeviceDriver) {
-            // 诺力4期对接位驱动
             PhotoelectricDetectionDeviceDriver driver = (PhotoelectricDetectionDeviceDriver) device.getDeviceDriver();
             if (driver.getMove() == 0) {
                 String message = "允许AGV放货。";
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java b/acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java
index 26695a5..24663ad 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java
@@ -10,8 +10,8 @@ import com.alibaba.fastjson.JSONObject;
  */
 public enum DriverTypeEnum {
     ORDINARY_SITE(1, "standard_ordinary_site", "普通站点", "station"),
-
-    PHOTOELECTRIC_DETECTION_DEVICE_DRIVER(2, "photoelectric_detection_station", "光电检测站点", "station");
+    STANDARD_STORAGE(2, "standard_storage", "标准版-货架", "storage"),
+    PHOTOELECTRIC_DETECTION_DEVICE_DRIVER(3, "photoelectric_detection_station", "光电检测站点", "station");
     //驱动索引
     private int index;
     //驱动编码
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
index cf530e2..fa9be1f 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
@@ -876,7 +876,7 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
                         celldto.setZ("0");
                         celldto.setAddress(0);
                         celldto.setCreate_by("init");
-                        celldto.setCreate_time(SecurityUtils.getCurrentUsername());
+                        celldto.setCreate_time(DateUtil.now());
                         wo.insert((JSONObject) JSONObject.toJSON(celldto));
                     }
                 }
@@ -892,7 +892,7 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
                     celldto.setZ("0");
                     celldto.setAddress(0);
                     celldto.setCreate_by("init");
-                    celldto.setCreate_time(SecurityUtils.getCurrentUsername());
+                    celldto.setCreate_time(DateUtil.now());
                     wo.insert((JSONObject) JSONObject.toJSON(celldto));
                 }
             }
diff --git a/acs/nladmin-ui/src/views/acs/device/index.vue b/acs/nladmin-ui/src/views/acs/device/index.vue
index 989a8b7..2390625 100644
--- a/acs/nladmin-ui/src/views/acs/device/index.vue
+++ b/acs/nladmin-ui/src/views/acs/device/index.vue
@@ -24,7 +24,7 @@
           style="width: 190px"
           @change="crud.toQuery"
         >
-          <el-option v-for="item in device_types" :key="item.id" :label="item.label" :value="item.value" />
+          <el-option v-for="item in device_types" :key="item.id" :label="item.label" :value="item.value"/>
         </el-select>
         <el-select
           v-model="query.region"
@@ -36,7 +36,7 @@
           style="width: 190px"
           @change="crud.toQuery"
         >
-          <el-option v-for="item in regions" :key="item.id" :label="item.label" :value="item.value" />
+          <el-option v-for="item in regions" :key="item.id" :label="item.label" :value="item.value"/>
         </el-select>
         <el-select
           v-model="query.is_config"
@@ -48,9 +48,9 @@
           style="width: 190px"
           @change="crud.toQuery"
         >
-          <el-option v-for="item in is_configs" :key="item.id" :label="item.label" :value="item.value" />
+          <el-option v-for="item in is_configs" :key="item.id" :label="item.label" :value="item.value"/>
         </el-select>
-        <rrOperation />
+        <rrOperation/>
       </div>
       <crudOperation :permission="permission">
         <el-button
@@ -60,7 +60,8 @@
           type="warning"
           icon="el-icon-download"
           @click="crud.doExport"
-        >导出模型</el-button>
+        >导出模型
+        </el-button>
         <el-button
           slot="right"
           class="filter-item"
@@ -92,13 +93,13 @@
       >
         <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
           <el-form-item v-if="false" label="设备标识" prop="device_id">
-            <el-input v-model="form.device_id" style="width: 370px;" />
+            <el-input v-model="form.device_id" style="width: 370px;"/>
           </el-form-item>
           <el-form-item label="设备编码" prop="device_code">
-            <el-input v-model="form.device_code" style="width: 370px;" />
+            <el-input v-model="form.device_code" style="width: 370px;"/>
           </el-form-item>
           <el-form-item label="设备名字" prop="device_name">
-            <el-input v-model="form.device_name" style="width: 370px;" />
+            <el-input v-model="form.device_name" style="width: 370px;"/>
           </el-form-item>
           <el-form-item label="设备类型" prop="device_type">
             <el-select v-model="form.device_type" style="width: 370px" placeholder="请选择">
@@ -111,10 +112,14 @@
             </el-select>
           </el-form-item>
           <el-form-item label="所属区域" prop="region">
-            <el-select v-model="form.region" style="width: 370px" placeholder="请选择">
+            <el-select
+              v-model="form.region"
+              style="width: 370px;"
+              filterable
+              placeholder="请选择"
+            >
               <el-option
-                v-for="item in regions"
-                :key="item.id"
+                v-for="item in dict.region"
                 :label="item.label"
                 :value="item.value"
               />
@@ -131,7 +136,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="顺序号" prop="seq_num">
-            <el-input-number v-model="form.seq_num" value="1" :min="1" label="描述文字" />
+            <el-input-number v-model="form.seq_num" value="1" :min="1" label="描述文字"/>
           </el-form-item>
           <!--          <el-form-item label="生产厂家">-->
           <!--            <el-input v-model="form.manufacturer" style="width: 370px;" />-->
@@ -140,7 +145,7 @@
           <!--            <el-input v-model="form.manufacturer_phone" style="width: 370px;" />-->
           <!--          </el-form-item>-->
           <el-form-item label="描述信息" prop="description">
-            <el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea" />
+            <el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea"/>
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -157,9 +162,9 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column type="selection" width="55" />
-        <el-table-column v-if="false" prop="device_id" label="设备标识" />
-        <el-table-column sortable prop="device_code" label="设备编码" />
+        <el-table-column type="selection" width="55"/>
+        <el-table-column v-if="false" prop="device_id" label="设备标识"/>
+        <el-table-column sortable prop="device_code" label="设备编码"/>
         <el-table-column sortable label="设备名字">
           <template slot-scope="scope">
             <div>{{ scope.row.device_name }}</div>
@@ -172,10 +177,10 @@
         </el-table-column>
         <el-table-column label="所属区域">
           <template slot-scope="scope">
-            <div>{{ scope.row.region_name }}</div>
+            {{ dict.label.region[scope.row.region] }}
           </template>
         </el-table-column>
-        <el-table-column sortable prop="seq_num" label="顺序号" />
+        <el-table-column sortable prop="seq_num" label="顺序号"/>
         <el-table-column prop="is_config" label="是否配置" width="75px">
           <template slot-scope="scope">
             <span v-if="scope.row.is_config=='true' ">是</span>
@@ -184,7 +189,7 @@
         </el-table-column>
         <!--        <el-table-column prop="manufacturer" label="生产厂家" />-->
         <!--        <el-table-column prop="manufacturer_phone" label="厂家电话" />-->
-        <el-table-column prop="remark" label="备注" />
+        <el-table-column prop="remark" label="备注"/>
         <el-table-column v-permission="['admin','device:edit','device:del']" label="操作" width="200px" align="center">
           <template slot-scope="scope">
             <udOperation
@@ -201,23 +206,23 @@
         </el-table-column>
       </el-table>
       <!--分页组件-->
-      <pagination />
+      <pagination/>
     </div>
-    <UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="tableChanged3" />
+    <UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="tableChanged3"/>
   </div>
 </template>
 
 <script>
 import crudDevice from '@/api/acs/device/device'
-import CRUD, { crud, form, header, presenter } from '@crud/crud'
+import CRUD, {crud, form, header, presenter} from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
-import { get } from '@/api/system/dictDetail'
+import {get} from '@/api/system/dictDetail'
 import UploadDialog from '@/views/acs/device/UploadDialog'
-import { download } from '@/api/data'
-import { downloadFile } from '@/utils'
+import {download} from '@/api/data'
+import {downloadFile} from '@/utils'
 
 const defaultForm = {
   manufacturer: null,
@@ -237,11 +242,11 @@ const defaultForm = {
   region: null,
   is_config: null,
   remark: null,
-  region: null
 }
 export default {
   name: 'Device',
-  components: { pagination, crudOperation, rrOperation, udOperation, UploadDialog },
+  dicts: ['region'],
+  components: {pagination, crudOperation, rrOperation, udOperation, UploadDialog},
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({
@@ -249,7 +254,7 @@ export default {
       url: 'api/device',
       idField: 'device_id',
       sort: 'device_id,desc',
-      crudMethod: { ...crudDevice }
+      crudMethod: {...crudDevice}
     })
   },
   data() {
@@ -264,19 +269,18 @@ export default {
       is_configs: [],
       uploadShow: false,
       device_code: '',
-      regions: [],
       rules: {
         device_code: [
-          { required: true, message: '设备编码不能为空', trigger: 'blur' }
+          {required: true, message: '设备编码不能为空', trigger: 'blur'}
         ],
         device_name: [
-          { required: true, message: '设备名字不能为空', trigger: 'blur' }
+          {required: true, message: '设备名字不能为空', trigger: 'blur'}
         ],
         device_type: [
-          { required: true, message: '设备类型不能为空', trigger: 'blur' }
+          {required: true, message: '设备类型不能为空', trigger: 'blur'}
         ],
         region: [
-          { required: true, message: '所属区域不能为空', trigger: 'blur' }
+          {required: true, message: '所属区域不能为空', trigger: 'blur'}
         ]
       }
     }
diff --git a/lms/nladmin-system/.gitignore b/lms/nladmin-system/.gitignore
index 8c1a75b..86ca903 100644
--- a/lms/nladmin-system/.gitignore
+++ b/lms/nladmin-system/.gitignore
@@ -7,3 +7,5 @@
 /.gradle/
 /target/*
 */application-dev.yml
+/C:*
+/D:*
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/controller/AcsToWmsController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/controller/AcsToWmsController.java
index bab53e3..f17ca6c 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/controller/AcsToWmsController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/controller/AcsToWmsController.java
@@ -26,7 +26,6 @@ public class AcsToWmsController {
     private AcsToWmsService acsToWmsService;
 
     @PostMapping("/apply")
-
     @SaIgnore
     public ResponseEntity<Object> apply(@RequestBody JSONObject param) {
         return new ResponseEntity<>(acsToWmsService.acsApply(param), HttpStatus.OK);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java
index 620e963..a641d68 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java
@@ -20,4 +20,12 @@ public interface AcsToWmsService {
      */
     BaseResponse acsApply(JSONObject param);
 
+    /**
+     * 任务：申请补空料盅托盘(叫空盘)
+     *
+     * @param param
+     * @return
+     */
+    ApplyTaskResponse applyPutEmptyVehicle(JSONObject param);
+
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
index ff81a74..fe72eb0 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
@@ -4,14 +4,21 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpStatus;
 import com.alibaba.fastjson.JSONObject;
+import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.exception.BadRequestException;
 import org.nl.system.service.notice.ISysNoticeService;
 import org.nl.wms.ext.acs.service.AcsToWmsService;
 import org.nl.wms.ext.acs.service.dto.to.BaseResponse;
+import org.nl.wms.ext.acs.service.dto.to.acs.ApplyTaskResponse;
 import org.nl.wms.ext.record.service.ISysInteractRecordService;
+import org.nl.wms.sch.point.service.ISchBasePointService;
+import org.nl.wms.sch.point.service.dao.SchBasePoint;
+import org.nl.wms.sch.task.service.ISchBaseTaskService;
 import org.nl.wms.sch.task_manage.GeneralDefinition;
 import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -20,6 +27,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @Author: lyd
@@ -37,6 +45,12 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
     private ISysNoticeService noticeService;
     @Autowired
     private ISysInteractRecordService interactRecordService;
+    @Autowired
+    private ISchBasePointService pointService;
+    @Autowired
+    private RedissonClient redissonClient;
+    @Autowired
+    private ISchBaseTaskService taskService;
 
     // 初始化反射方法
     @PostConstruct
@@ -77,4 +91,42 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         return result;
     }
 
+    /**
+     * 任务：申请补空料盅托盘(叫空盘)
+     *
+     * @param param: ApplyTaskRequest的json形式
+     * @return
+     * @see org.nl.wms.ext.acs.service.dto.to.wms.ApplyTaskRequest
+     */
+    @Override
+    @SneakyThrows
+    public ApplyTaskResponse applyPutEmptyVehicle(JSONObject param) {
+        // 找到当前的设备
+        String deviceCode = param.getString("device_code");
+        String requestNo = param.getString("requestNo");
+        SchBasePoint basePoint = pointService.getById(deviceCode);
+        String configCode = basePoint.getRegion_code() + "QKTask";
+        RLock lock = redissonClient.getLock(configCode);
+        boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
+        try {
+            if (tryLock) {
+
+                if (ObjectUtil.isEmpty(basePoint)) {
+                    throw new BadRequestException("点位错误！");
+                }
+
+                // 组织参数
+                param.put("config_code", configCode);
+                taskService.apply(param);
+            } else {
+                throw new BadRequestException("其他设备占用锁，等待结束！");
+            }
+        } finally {
+            if (tryLock) {
+                lock.unlock();
+            }
+        }
+        return ApplyTaskResponse.responseOk(requestNo);
+    }
+
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java
index 018a0f1..caf89e5 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java
@@ -141,7 +141,7 @@ public class WmsToMesServiceImpl implements WmsToMesService {
         mesProductDataDto.setPRESSUNIT(basePoint.getExt_point_code());
         mesProductDataDto.setFTEAM(workorder.getTeam());
         mesProductDataDto.setTRAY_NO(vehiclematerialgroup.getVehicle_code());
-        mesProductDataDto.setPRO_SUBNUM(BigDecimal.valueOf(vehiclematerialgroup.getMaterial_qty()));
+        //mesProductDataDto.setPRO_SUBNUM(BigDecimal.valueOf(vehiclematerialgroup.getMaterial_qty()));
         mesProductDataDto.setPRO_SUBUNIT("块");
         mesProductDataDto.setCHECKERIN_TIM(DateUtil.now());
         mesProductDataDto.setPRODATE(ObjectUtil.isNotEmpty(workorder.getProduce_date())
@@ -187,7 +187,7 @@ public class WmsToMesServiceImpl implements WmsToMesService {
         semiProductionInfoInDto.setBATCHNO(mesWorkOrderDto.getBATCHNO());
         semiProductionInfoInDto.setFTEAM(workorder.getTeam());
         semiProductionInfoInDto.setTRAY_NO(vehiclematerialgroup.getVehicle_code());
-        semiProductionInfoInDto.setPRO_SUBNUM(BigDecimal.valueOf(vehiclematerialgroup.getMaterial_qty()));
+        //semiProductionInfoInDto.setPRO_SUBNUM(BigDecimal.valueOf(vehiclematerialgroup.getMaterial_qty()));
         semiProductionInfoInDto.setPRO_SUBUNIT("块");
         semiProductionInfoInDto.setCHECKERIN_TIM(DateUtil.now());
         semiProductionInfoInDto.setPRODATE(workorder.getProduce_date());
@@ -228,7 +228,7 @@ public class WmsToMesServiceImpl implements WmsToMesService {
         semiProductionInfoOutDto.setFPRODUCT_MATERIAL_NAME(mesWorkOrderDto.getFPRODUCT_MATERIAL_NAME());
         semiProductionInfoOutDto.setFMATSPEC(mesWorkOrderDto.getFMATSPEC());
         semiProductionInfoOutDto.setFMATMODEL(mesWorkOrderDto.getFMATMODEL());
-        semiProductionInfoOutDto.setPRO_SUBNUM(BigDecimal.valueOf(vehiclematerialgroup.getMaterial_qty()));
+        //semiProductionInfoOutDto.setPRO_SUBNUM(BigDecimal.valueOf(vehiclematerialgroup.getMaterial_qty()));
         semiProductionInfoOutDto.setPRO_SUBUNIT("块");
         semiProductionInfoOutDto.setSTOCK("未知");
         semiProductionInfoOutDto.setSTOCK_NAME("未知");
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java
index 346f572..60a95ce 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java
@@ -11,6 +11,7 @@ import org.nl.wms.das.device.operation.service.IDasDeviceOperationRecordService;
 import org.nl.wms.das.device.operation.service.dao.DasDeviceOperationRecord;
 import org.nl.wms.pda.service.PdaService;
 import org.nl.wms.pda.service.dao.dto.*;
+import org.nl.wms.pda.service.dao.vo.LinkMaterialVo;
 import org.nl.wms.pda.service.dao.vo.PdaResponseVo;
 import org.nl.wms.pda.service.dao.vo.RequestMaterialInfoVo;
 import org.nl.wms.pdm.workorder.service.IPdmBdWorkorderService;
@@ -23,6 +24,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Author: lyd
  * @Description: 手持接口
@@ -43,6 +46,92 @@ public class PdaController {
     @Autowired
     private IPdmBdWorkorderService workorderService;
 
+
+    @PostMapping("/queryPoints")
+    @Log("获取点位信息")
+    public ResponseEntity<Object> queryPoints(@Validated @RequestBody PointsQueryDto requestParam) {
+        return new ResponseEntity<>(pdaService.queryPoints(requestParam), HttpStatus.OK);
+    }
+
+    @PostMapping("/group/getVehicleType")
+    @Log("获取载具类型")
+    public ResponseEntity<Object> getVehicleType() {
+        return new ResponseEntity<>(pdaService.getVehicleType(), HttpStatus.OK);
+    }
+
+    @PostMapping("/queryMaterial")
+    @Log("获取物料信息")
+    public ResponseEntity<Object> queryMaterial() {
+        return new ResponseEntity<>(pdaService.queryMaterial(), HttpStatus.OK);
+    }
+
+    @PostMapping("/queryVehicleGroup")
+    @Log("获取待配盘信息")
+    public ResponseEntity<Object> queryVehicleGroup() {
+        return new ResponseEntity<>(pdaService.queryVehicleGroup(), HttpStatus.OK);
+    }
+
+    @PostMapping("/group/manual")
+    @Log("开始组盘")
+    public ResponseEntity<PdaResponseVo> manualDiskAssembly(@Validated @RequestBody ManualGroupDto requestParam) {
+        return new ResponseEntity<>(pdaService.manualCreateByPda(requestParam), HttpStatus.OK);
+    }
+
+    @PostMapping("/group/link")
+    @Log("开始配盘")
+    public ResponseEntity<PdaResponseVo> link(@Validated @RequestBody List<GroupLinkDto> requestParam) {
+        return new ResponseEntity<>(pdaService.link(requestParam), HttpStatus.OK);
+    }
+
+    @PostMapping("/callEmptyVehicle")
+    @Log("呼叫空托盘")
+    public ResponseEntity<PdaResponseVo> callEmptyVehicle(@Validated @RequestBody CommonPointQueryDto requestParam) {
+        return new ResponseEntity<>(pdaService.callEmptyVehicle(requestParam), HttpStatus.OK);
+    }
+
+    @PostMapping("/fullVehicleIn")
+    @Log("满托入库")
+    public ResponseEntity<PdaResponseVo> fullVehicleIn(@Validated @RequestBody CommonPointQueryDto requestParam) {
+        return new ResponseEntity<>(pdaService.fullVehicleIn(requestParam), HttpStatus.OK);
+    }
+
+    @PostMapping("/fullVehicleOut")
+    @Log("满托出库")
+    public ResponseEntity<PdaResponseVo> fullVehicleOut(@Validated @RequestBody FullVehicleOutDto requestParam) {
+        return new ResponseEntity<>(pdaService.fullVehicleOut(requestParam), HttpStatus.OK);
+    }
+
+    @PostMapping("/vehicleGoBack")
+    @Log("余料回库")
+    public ResponseEntity<PdaResponseVo> fullVehicleOut(@Validated @RequestBody VehicleGoBackDto requestParam) {
+        return new ResponseEntity<>(pdaService.vehicleGoBack(requestParam), HttpStatus.OK);
+    }
+
+    @PostMapping("/fullVehicleOutConfirm")
+    @Log("满托出库确认")
+    public ResponseEntity<PdaResponseVo> fullVehicleOutConfirm(@Validated @RequestBody FullVehicleOutConfirmDto requestParam) {
+        return new ResponseEntity<>(pdaService.fullVehicleOutConfirm(requestParam), HttpStatus.OK);
+    }
+
+    @PostMapping("/queryLinkMaterial")
+    @Log("根据物料信息查询配盘信息")
+    public ResponseEntity<Object> queryLinkMaterial(@Validated @RequestBody MaterialQueryDto requestParam) {
+        return new ResponseEntity<>(pdaService.queryLinkMaterial(requestParam), HttpStatus.OK);
+    }
+
+    @PostMapping("/queryAllPoints")
+    @Log("查询起点及其对应终点")
+    public ResponseEntity<Object> queryAllPoints() {
+        return new ResponseEntity<>(pdaService.queryAllPoints(), HttpStatus.OK);
+    }
+
+    @PostMapping("/createP2pTask")
+    @Log("创建点对点流传任务")
+    public ResponseEntity<PdaResponseVo> createP2pTask(@Validated @RequestBody FullVehicleOutDto requestParam) {
+        return new ResponseEntity<>(pdaService.createP2pTask(requestParam), HttpStatus.OK);
+    }
+
+
     @PostMapping("/deviceCheck/verify")
     @Log("设备点检")
     public ResponseEntity<Object> deviceCheck(@Validated @RequestBody DasDeviceCheckRecord entity) {
@@ -79,11 +168,6 @@ public class PdaController {
         return new ResponseEntity<>(pdaService.getDeviceInfo(), HttpStatus.OK);
     }
 
-    @PostMapping("/group/getVehicleType")
-    @Log("获取载具类型")
-    public ResponseEntity<Object> getVehicleType() {
-        return new ResponseEntity<>(pdaService.getVehicleType(), HttpStatus.OK);
-    }
 
     @PostMapping("/group/getPressWorkOrder")
     @Log("获取工单编码")
@@ -92,11 +176,6 @@ public class PdaController {
         return new ResponseEntity<>(workorderService.getDeviceProductionTask(param.getString("point_code")), HttpStatus.OK);
     }
 
-    @PostMapping("/group/manual")
-    @Log("人工组盘")
-    public ResponseEntity<PdaResponseVo> manualDiskAssembly(@Validated @RequestBody ManualGroupDto entity) {
-        return new ResponseEntity<>(pdaService.manualCreateByPda(entity), HttpStatus.OK);
-    }
 
     @PostMapping("/move/getBlendingCode")
     @Log("获取混碾机编码")
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/PdaService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/PdaService.java
index e6f5923..cff8f9c 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/PdaService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/PdaService.java
@@ -2,6 +2,7 @@ package org.nl.wms.pda.service;
 
 import org.nl.wms.pda.service.dao.dto.*;
 import org.nl.wms.pda.service.dao.vo.*;
+import org.nl.wms.sch.point.service.dao.SchBasePoint;
 
 import java.util.List;
 
@@ -11,6 +12,129 @@ import java.util.List;
  * @Date: 2023/8/1
  */
 public interface PdaService {
+
+
+    /**
+     * 获取入库对接位和出库对接位点位信息
+     *
+     * @param requestParam
+     * @return
+     */
+    List<PointVo> queryPoints(PointsQueryDto requestParam);
+
+    /**
+     * 获取载具类型
+     *
+     * @return
+     */
+    List<DropdownListVo> getVehicleType();
+
+
+    /**
+     * 获取物料信息
+     *
+     * @return
+     */
+    List<MaterialInfoVo> queryMaterial();
+
+
+    /**
+     * 获取待配盘信息
+     *
+     * @return
+     */
+    List<VehicleLinkVo> queryVehicleGroup();
+
+
+    /**
+     * 手持开始组盘
+     *
+     * @param entity
+     * @return
+     */
+    PdaResponseVo manualCreateByPda(ManualGroupDto entity);
+
+    /**
+     * 手持开始配盘
+     *
+     * @param requestParam
+     * @return
+     */
+    PdaResponseVo link(List<GroupLinkDto> requestParam);
+
+
+    /**
+     * 呼叫空托
+     *
+     * @param requestParam
+     * @return
+     */
+    PdaResponseVo callEmptyVehicle(CommonPointQueryDto requestParam);
+
+    /**
+     * 满托入库
+     *
+     * @param requestParam
+     * @return
+     */
+    PdaResponseVo fullVehicleIn(CommonPointQueryDto requestParam);
+
+    /**
+     * 满托出库
+     *
+     * @param requestParam
+     * @return
+     */
+    PdaResponseVo fullVehicleOut(FullVehicleOutDto requestParam);
+
+    /**
+     * 余料回库
+     *
+     * @param requestParam
+     * @return
+     */
+    PdaResponseVo vehicleGoBack(VehicleGoBackDto requestParam);
+
+    /**
+     * 满托出库确认
+     *
+     * @param requestParam
+     * @return
+     */
+    PdaResponseVo fullVehicleOutConfirm(FullVehicleOutConfirmDto requestParam);
+
+    /**
+     * 根据物料信息查询配盘信息
+     *
+     * @param requestParam
+     * @return
+     */
+    List<VehicleLinkVo> queryLinkMaterial(MaterialQueryDto requestParam);
+
+    /**
+     * 查询所有定点任务的起点及其对应终点
+     *
+     * @return
+     */
+    List<PointVo> queryAllPoints();
+
+    /**
+     * 创建点对点的任务
+     *
+     * @param requestParam
+     * @return
+     */
+    PdaResponseVo createP2pTask(FullVehicleOutDto requestParam);
+
+    /**
+     * 转成PointVo
+     *
+     * @param list
+     * @return
+     */
+    List<PointVo> copyPointVoList(List<SchBasePoint> list);
+
+
     /**
      * 获取设备信息
      *
@@ -32,13 +156,6 @@ public interface PdaService {
      */
     List<DropdownListVo> deviceAction();
 
-    /**
-     * 人工通过手持组盘
-     *
-     * @param entity
-     * @return
-     */
-    PdaResponseVo manualCreateByPda(ManualGroupDto entity);
 
     /**
      * 获取混碾机编码
@@ -70,12 +187,6 @@ public interface PdaService {
      */
     List<StandTimeShowVo> forcedRestingShow();
 
-    /**
-     * 获取载具类型
-     *
-     * @return
-     */
-    List<DropdownListVo> getVehicleType();
 
     /**
      * 人工分拣-显示工单
@@ -225,4 +336,6 @@ public interface PdaService {
      * @return
      */
     PdaResponseVo deleteMaterialInfo(RequestMaterialInfoVo requestMaterialInfoVo);
+
+
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/CommonPointQueryDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/CommonPointQueryDto.java
new file mode 100644
index 0000000..c52eb27
--- /dev/null
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/CommonPointQueryDto.java
@@ -0,0 +1,13 @@
+package org.nl.wms.pda.service.dao.dto;
+
+import lombok.Data;
+
+/**
+ * @Description TODO
+ * @Author Gengby
+ * @Date 2024/1/27
+ */
+@Data
+public class CommonPointQueryDto {
+    private String point_code;
+}
\ No newline at end of file
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/FullVehicleOutConfirmDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/FullVehicleOutConfirmDto.java
new file mode 100644
index 0000000..cda3548
--- /dev/null
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/FullVehicleOutConfirmDto.java
@@ -0,0 +1,15 @@
+package org.nl.wms.pda.service.dao.dto;
+
+import lombok.Data;
+
+/**
+ * @Description TODO
+ * @Author Gengby
+ * @Date 2024/1/27
+ */
+@Data
+public class FullVehicleOutConfirmDto {
+    private String point_code;
+    private String vehicle_code;
+    private String residue_num;
+}
\ No newline at end of file
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/FullVehicleOutDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/FullVehicleOutDto.java
new file mode 100644
index 0000000..0fb489e
--- /dev/null
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/FullVehicleOutDto.java
@@ -0,0 +1,14 @@
+package org.nl.wms.pda.service.dao.dto;
+
+import lombok.Data;
+
+/**
+ * @Description TODO
+ * @Author Gengby
+ * @Date 2024/1/27
+ */
+@Data
+public class FullVehicleOutDto {
+    private String point_code1;
+    private String point_code2;
+}
\ No newline at end of file
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/GroupLinkDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/GroupLinkDto.java
new file mode 100644
index 0000000..525890f
--- /dev/null
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/GroupLinkDto.java
@@ -0,0 +1,14 @@
+package org.nl.wms.pda.service.dao.dto;
+
+import lombok.Data;
+
+/**
+ * @Description TODO
+ * @Author Gengby
+ * @Date 2024/1/27
+ */
+@Data
+public class GroupLinkDto {
+    private String group_id;
+    private String vehicle_code;
+}
\ No newline at end of file
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/ManualGroupDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/ManualGroupDto.java
index 6737c7f..f9486a6 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/ManualGroupDto.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/ManualGroupDto.java
@@ -14,9 +14,8 @@ public class ManualGroupDto {
     private String vehicle_code;
     private String vehicle_type;
     private String point_code;
-    /**
-     * 不需要的参数
-     */
-    private String order_code;
-    private BigDecimal material_weight;
+    private String material_id;
+    private String material_code;
+    private String material_qty;
+    private boolean is_link;
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/MaterialQueryDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/MaterialQueryDto.java
new file mode 100644
index 0000000..01bbce3
--- /dev/null
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/MaterialQueryDto.java
@@ -0,0 +1,15 @@
+package org.nl.wms.pda.service.dao.dto;
+
+import lombok.Data;
+
+/**
+ * @Description TODO
+ * @Author Gengby
+ * @Date 2024/1/27
+ */
+@Data
+public class MaterialQueryDto {
+    private String material_id;
+    private String material_code;
+    private String material_name;
+}
\ No newline at end of file
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/PointsQueryDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/PointsQueryDto.java
new file mode 100644
index 0000000..aed1ace
--- /dev/null
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/PointsQueryDto.java
@@ -0,0 +1,17 @@
+package org.nl.wms.pda.service.dao.dto;
+
+import lombok.Data;
+
+/**
+ * @Description TODO
+ * @Author Gengby
+ * @Date 2024/1/27
+ */
+@Data
+public class PointsQueryDto {
+    /**
+     * 1、代表获取入库点位信息
+     * 2、代表获取出库点位信息
+     */
+    private String type;
+}
\ No newline at end of file
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/VehicleGoBackDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/VehicleGoBackDto.java
new file mode 100644
index 0000000..8afca5a
--- /dev/null
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/VehicleGoBackDto.java
@@ -0,0 +1,16 @@
+package org.nl.wms.pda.service.dao.dto;
+
+import lombok.Data;
+
+/**
+ * @Description TODO
+ * @Author Gengby
+ * @Date 2024/1/27
+ */
+@Data
+public class VehicleGoBackDto {
+    private String point_code;
+    private String vehicle_code;
+    private String vehicle_type;
+    private String residue_num;
+}
\ No newline at end of file
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.java
index 90e510a..a68fdcd 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.java
@@ -12,10 +12,19 @@ import java.util.List;
  * @Date: 2023/8/1
  */
 public interface PdaMapper {
-    List<DropdownListVo> getDeviceInfo();
+
+    List<PointVo> queryPoints(String region_code);
 
     List<DropdownListVo> getDictByCode(String code);
 
+    List<MaterialInfoVo> queryMaterial();
+
+    List<VehicleLinkVo> queryVehicleGroup();
+
+
+
+    List<DropdownListVo> getDeviceInfo();
+
     /**
      * 根据区域编码和点位名称获取信息
      *
@@ -86,4 +95,7 @@ public interface PdaMapper {
      * @return
      */
     List<RequestMaterialInfoVo> requestInfo();
+
+
+
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.xml
index 105c8f3..5b4a0c8 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.xml
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.xml
@@ -2,6 +2,41 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.nl.wms.pda.service.dao.mapper.PdaMapper">
 
+    <select id="queryPoints" resultType="org.nl.wms.pda.service.dao.vo.PointVo">
+        select p.point_code,
+               p.point_name
+        from `sch_base_point` p
+        where p.region_code = #{region_code}
+    </select>
+
+    <select id="getDictByCode" resultType="org.nl.wms.pda.service.dao.vo.DropdownListVo">
+        SELECT `value`,
+               label AS text
+        FROM `sys_dict`
+        WHERE `code` = #{code}
+    </select>
+
+    <select id="queryMaterial" resultType="org.nl.wms.pda.service.dao.vo.MaterialInfoVo">
+        select m.material_id,
+               m.material_code,
+               m.material_name
+        from md_base_material m
+    </select>
+
+    <select id="queryVehicleGroup" resultType="org.nl.wms.pda.service.dao.vo.VehicleLinkVo">
+        select group_id,
+               material_id,
+               material_name,
+               point_code,
+               vehicle_code,
+               vehicle_type
+        from `sch_base_vehiclematerialgroup`
+        where link_status = '0'
+          and group_status = '2'
+          and group_bind_material_status = '2'
+    </select>
+
+
     <select id="getDeviceInfo" resultType="org.nl.wms.pda.service.dao.vo.DropdownListVo">
         SELECT p.point_code AS `value`,
                p.point_name AS text
@@ -10,12 +45,7 @@
           AND p.point_type = '1'
           AND p.point_code = p.parent_point_code
     </select>
-    <select id="getDictByCode" resultType="org.nl.wms.pda.service.dao.vo.DropdownListVo">
-        SELECT `value`,
-               label AS text
-        FROM `sys_dict`
-        WHERE `code` = #{code}
-    </select>
+
     <select id="getDeviceInfos" resultType="org.nl.wms.pda.service.dao.vo.DropdownListVo">
         SELECT p.point_code AS `value`,
                p.point_name AS text
@@ -36,11 +66,11 @@
     <select id="forcedRestingShow" resultType="org.nl.wms.pda.service.dao.vo.StandTimeShowVo">
         SELECT vg.group_id,
                vg.point_code,
-               p2.point_name                                                                                   AS device_code,
+               p2.point_name                                                                               AS device_code,
                vg.standing_time,
-               TIMESTAMPDIFF(MINUTE, NOW(), DATE_ADD(vg.instorage_time, INTERVAL vg.standing_time MINUTE))     AS timeDifferenceMinutes,
+               TIMESTAMPDIFF(MINUTE, NOW(), DATE_ADD(vg.instorage_time, INTERVAL vg.standing_time MINUTE)) AS timeDifferenceMinutes,
                DATE_FORMAT(DATE_ADD(vg.instorage_time, INTERVAL vg.standing_time MINUTE),
-                           '%Y-%m-%d %H:%i:%s')                                                                AS estimatedCompletionTimeString
+                           '%Y-%m-%d %H:%i:%s')                                                            AS estimatedCompletionTimeString
         FROM `sch_base_vehiclematerialgroup` vg
                  LEFT JOIN sch_base_point p1 ON p1.point_code = vg.point_code
                  LEFT JOIN sch_base_point p2 ON p2.point_code = p1.parent_point_code
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/LinkMaterialVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/LinkMaterialVo.java
new file mode 100644
index 0000000..4ba478d
--- /dev/null
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/LinkMaterialVo.java
@@ -0,0 +1,20 @@
+package org.nl.wms.pda.service.dao.vo;
+
+import lombok.Data;
+
+/**
+ * @Description TODO
+ * @Author Gengby
+ * @Date 2024/1/27
+ */
+@Data
+public class LinkMaterialVo {
+    private String point_code;
+    private String point_name;
+    private String vehicle_code;
+    private String material_id;
+    private String material_code;
+    private String material_name;
+    private String pcsn;
+    private String material_qty;
+}
\ No newline at end of file
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/MaterialInfoVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/MaterialInfoVo.java
index 4681e20..e9333b2 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/MaterialInfoVo.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/MaterialInfoVo.java
@@ -12,6 +12,4 @@ public class MaterialInfoVo {
     private String material_id;
     private String material_code;
     private String material_name;
-    private String material_spec;
-    private String material_model;
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/PointVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/PointVo.java
new file mode 100644
index 0000000..e4178c0
--- /dev/null
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/PointVo.java
@@ -0,0 +1,18 @@
+package org.nl.wms.pda.service.dao.vo;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description TODO
+ * @Author Gengby
+ * @Date 2024/1/27
+ */
+@Data
+public class PointVo {
+    private String point_code;
+    private String point_name;
+    private List<PointVo> end_points = new ArrayList<>();
+}
\ No newline at end of file
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/VehicleLinkVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/VehicleLinkVo.java
new file mode 100644
index 0000000..144df9a
--- /dev/null
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/VehicleLinkVo.java
@@ -0,0 +1,19 @@
+package org.nl.wms.pda.service.dao.vo;
+
+import lombok.Data;
+
+/**
+ * @Description TODO
+ * @Author Gengby
+ * @Date 2024/1/27
+ */
+@Data
+public class VehicleLinkVo {
+    private String group_id;
+    private String material_code;
+    private String material_id;
+    private String material_name;
+    private String point_code;
+    private String vehicle_code;
+    private String vehicle_type;
+}
\ No newline at end of file
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java
index 1ac6f66..ecceed5 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java
@@ -1,12 +1,16 @@
 package org.nl.wms.pda.service.impl;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.exception.BadRequestException;
+import org.nl.common.utils.CodeUtil;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.wms.database.material.service.IMdBaseMaterialService;
 import org.nl.wms.database.material.service.dao.MdBaseMaterial;
@@ -29,10 +33,7 @@ import org.nl.wms.sch.point.service.ISchBasePointService;
 import org.nl.wms.sch.point.service.dao.SchBasePoint;
 import org.nl.wms.sch.task.service.ISchBaseTaskService;
 import org.nl.wms.sch.task_manage.GeneralDefinition;
-import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum;
-import org.nl.wms.sch.task_manage.enums.GroupStatusEnum;
-import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
-import org.nl.wms.sch.task_manage.enums.WorkOrderStatusEnum;
+import org.nl.wms.sch.task_manage.enums.*;
 import org.nl.wms.util.PointUtils;
 import org.nl.wms.util.TaskUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,7 +41,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 /**
  * @Author: lyd
@@ -69,6 +73,307 @@ public class PdaServiceImpl implements PdaService {
     @Autowired
     private IPdmBdRequestMaterialRecordService requestMaterialRecordService;
 
+    @Override
+    public List<PointVo> queryPoints(PointsQueryDto requestParam) {
+        Assert.notNull(requestParam, "参数不能为空!");
+        String region_code = null;
+        if (StrUtil.equals(requestParam.getType(), "1")) {
+            region_code = "ZP";
+        } else if (StrUtil.equals(requestParam.getType(), "2")) {
+            region_code = "JLHC";
+        }
+        Assert.notBlank(region_code, "传入参数有误!");
+        return pdaMapper.queryPoints(region_code);
+    }
+
+    @Override
+    public List<DropdownListVo> getVehicleType() {
+        return pdaMapper.getDictByCode("vehicle_type");
+    }
+
+    @Override
+    public List<MaterialInfoVo> queryMaterial() {
+        return pdaMapper.queryMaterial();
+    }
+
+    @Override
+    public List<VehicleLinkVo> queryVehicleGroup() {
+        return pdaMapper.queryVehicleGroup();
+    }
+
+    @Override
+    public PdaResponseVo manualCreateByPda(ManualGroupDto entity) {
+        Assert.notNull(entity, "参数不能为空!");
+        SchBaseVehiclematerialgroup groupInfo = vehiclematerialgroupService.getGroupInfo(entity.getVehicle_code(),
+                entity.getVehicle_type(), GroupBindMaterialStatusEnum.BOUND.getValue());
+        Assert.isFalse(ObjectUtil.isNotEmpty(groupInfo), "组盘信息已存在");
+        // 获取点位
+        SchBasePoint basePoint = pointService.getById(entity.getPoint_code());
+        // 获取物料
+        MdBaseMaterial material = materialService.getById(entity.getMaterial_id());
+        SchBaseVehiclematerialgroup group = new SchBaseVehiclematerialgroup();
+        group.setGroup_id(IdUtil.getSnowflake(1, 1).nextIdStr());
+        group.setVehicle_type(entity.getVehicle_type());
+        group.setVehicle_code(entity.getVehicle_code());
+        group.setMaterial_id(material.getMaterial_id());
+        group.setSource_vehicle_code(entity.getPoint_code());
+        group.setPoint_code(entity.getPoint_code());
+        group.setPoint_name(basePoint.getPoint_name());
+        group.setInstorage_time(DateUtil.now());
+        group.setMaterial_qty(entity.getMaterial_qty());
+        group.setInstorage_time(DateUtil.now());
+        group.setGroup_status(GroupStatusEnum.IN_STORAGE.getType());
+        //判断是否需要配盘
+        group.setLink_status(!entity.is_link() ? LinkStatusEnum.LINK_FINISH.getType() : LinkStatusEnum.LINK_READY.getType());
+        group.setPcsn(!entity.is_link() ? CodeUtil.getNewCode("PCSN_CODE") : null);
+        group.setMove_way(basePoint.getPoint_code());
+        group.setBuss_move_id(IdUtil.getSnowflake(1, 1).nextIdStr());
+        group.setCreate_id(SecurityUtils.getCurrentUserId());
+        group.setCreate_name(SecurityUtils.getCurrentNickName());
+        group.setCreate_time(DateUtil.now());
+        vehiclematerialgroupService.save(group);
+        return PdaResponseVo.pdaResultOk("组盘成功");
+    }
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public PdaResponseVo link(List<GroupLinkDto> requestParam) {
+        Assert.notNull(requestParam, "参数不能为空!");
+        List<String> groups = requestParam.stream().map(GroupLinkDto::getGroup_id)
+                .collect(Collectors.toList());
+        LambdaQueryWrapper<SchBaseVehiclematerialgroup> lqw =
+                new LambdaQueryWrapper<>();
+        lqw.in(SchBaseVehiclematerialgroup::getGroup_id, groups);
+        List<SchBaseVehiclematerialgroup> list = vehiclematerialgroupService.list(lqw);
+        String pcsn_code = CodeUtil.getNewCode("PCSN_CODE");
+        for (SchBaseVehiclematerialgroup vehiclematerialgroup : list) {
+            vehiclematerialgroup.setLink_status(LinkStatusEnum.LINK_FINISH.getType());
+            vehiclematerialgroup.setPcsn(pcsn_code);
+            vehiclematerialgroup.setUpdate_id(SecurityUtils.getCurrentUserId());
+            vehiclematerialgroup.setUpdate_name(SecurityUtils.getCurrentNickName());
+            vehiclematerialgroup.setUpdate_time(DateUtil.now());
+            vehiclematerialgroupService.update(vehiclematerialgroup);
+        }
+        return PdaResponseVo.pdaResultOk("配盘完成");
+    }
+
+    @Override
+    public PdaResponseVo callEmptyVehicle(CommonPointQueryDto requestParam) {
+        Assert.notNull(requestParam, "参数不能为空!");
+        JSONObject param = new JSONObject();
+        param.put("device_code", requestParam.getPoint_code());
+        param.put("config_code", "ZPQKTask");
+        param.put("requestNo", IdUtil.simpleUUID());
+        param.put("user_id", "1");
+        taskService.apply(param);
+        return PdaResponseVo.pdaResultOk("呼叫空托请求成功");
+    }
+
+    @Override
+    public PdaResponseVo fullVehicleIn(CommonPointQueryDto requestParam) {
+        Assert.notNull(requestParam, "参数不能为空!");
+        JSONObject param = new JSONObject();
+        param.put("device_code", requestParam.getPoint_code());
+        param.put("config_code", "ZPRKTask");
+        param.put("requestNo", IdUtil.simpleUUID());
+        param.put("user_id", "1");
+        taskService.apply(param);
+        return PdaResponseVo.pdaResultOk("满托入库请求成功");
+    }
+
+    @Override
+    public PdaResponseVo fullVehicleOut(FullVehicleOutDto requestParam) {
+        Assert.notNull(requestParam, "参数不能为空!");
+        JSONObject param = new JSONObject();
+        param.put("device_code", requestParam.getPoint_code1());
+        param.put("device_code2", requestParam.getPoint_code2());
+        param.put("config_code", "JLHCQMTask");
+        param.put("requestNo", IdUtil.simpleUUID());
+        param.put("user_id", "1");
+        taskService.apply(param);
+        return PdaResponseVo.pdaResultOk("满托出库请求成功");
+    }
+
+    @Override
+    public PdaResponseVo vehicleGoBack(VehicleGoBackDto requestParam) {
+        Assert.notNull(requestParam, "参数不能为空!");
+        String vehicle_code = requestParam.getVehicle_code();
+        Assert.notNull(vehicle_code, "载具号不能为空!");
+        String residue_num = requestParam.getResidue_num();
+        Assert.notNull(residue_num, "余料数量不能为空!");
+        LambdaQueryWrapper<SchBaseVehiclematerialgroup> lqw =
+                new LambdaQueryWrapper<>();
+        lqw.eq(SchBaseVehiclematerialgroup::getVehicle_code, vehicle_code)
+                .eq(SchBaseVehiclematerialgroup::getGroup_status, GroupStatusEnum.IN_STORAGE.getType())
+                .eq(SchBaseVehiclematerialgroup::getLink_status, LinkStatusEnum.LINK_FINISH);
+        SchBaseVehiclematerialgroup groupOne = vehiclematerialgroupService.getOne(lqw);
+        Assert.notNull(groupOne, "载具号:'" + vehicle_code + "',对应的组盘信息不存在!");
+        this.checkQty(groupOne, residue_num);
+        JSONObject param = new JSONObject();
+        param.put("device_code", requestParam.getPoint_code());
+        param.put("config_code", "JLHCHKTask");
+        param.put("requestNo", IdUtil.simpleUUID());
+        param.put("user_id", "1");
+        taskService.apply(param);
+        return PdaResponseVo.pdaResultOk("余料回库请求成功");
+    }
+
+    @Override
+    public PdaResponseVo fullVehicleOutConfirm(FullVehicleOutConfirmDto requestParam) {
+        Assert.notNull(requestParam, "参数不能为空!");
+        String point_code = requestParam.getPoint_code();
+        Assert.notBlank(point_code, "点位编码不能为空!");
+        String vehicle_code = requestParam.getVehicle_code();
+        Assert.notBlank(vehicle_code, "载具号不能为空!");
+        String residue_num = requestParam.getResidue_num();
+        Assert.notBlank(residue_num, "余料数量不能为空!");
+        LambdaQueryWrapper<SchBaseVehiclematerialgroup> lqw =
+                new LambdaQueryWrapper<>();
+        lqw.eq(SchBaseVehiclematerialgroup::getVehicle_code, vehicle_code)
+                .eq(SchBaseVehiclematerialgroup::getGroup_status, GroupStatusEnum.IN_STORAGE.getType())
+                .eq(SchBaseVehiclematerialgroup::getLink_status, LinkStatusEnum.LINK_FINISH);
+        SchBaseVehiclematerialgroup groupOne = vehiclematerialgroupService.getOne(lqw);
+        Assert.notNull(groupOne, "载具号:'" + vehicle_code + "',对应的组盘信息不存在!");
+        this.checkQty(groupOne, residue_num);
+        //如果余料数量为0
+        if (residue_num.matches("^0*(\\.\\d+)?$")) {
+            groupOne.setLink_status(LinkStatusEnum.LINK_READY.getType());
+            groupOne.setPcsn("");
+            groupOne.setMaterial_code("");
+            groupOne.setMaterial_id("");
+            groupOne.setMaterial_name("");
+            groupOne.setInstorage_time(DateUtil.now());
+            groupOne.setUpdate_id(SecurityUtils.getCurrentUserId());
+            groupOne.setUpdate_name(SecurityUtils.getCurrentNickName());
+            groupOne.setUpdate_time(DateUtil.now());
+            groupOne.setGroup_bind_material_status(GroupBindMaterialStatusEnum.UNBOUND.getValue());
+            vehiclematerialgroupService.update(groupOne);
+        } else {
+            //如果余料数量不为0
+            groupOne.setMaterial_qty(residue_num);
+            groupOne.setUpdate_id(SecurityUtils.getCurrentUserId());
+            groupOne.setUpdate_name(SecurityUtils.getCurrentNickName());
+            groupOne.setUpdate_time(DateUtil.now());
+            vehiclematerialgroupService.update(groupOne);
+        }
+        return PdaResponseVo.pdaResultOk("满托出库确认请求成功");
+    }
+
+    @Override
+    public List<VehicleLinkVo> queryLinkMaterial(MaterialQueryDto requestParam) {
+        Assert.notNull(requestParam, "参数不能为空!");
+        LambdaQueryWrapper<SchBaseVehiclematerialgroup> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(SchBaseVehiclematerialgroup::getMaterial_id, requestParam.getMaterial_id())
+                .eq(SchBaseVehiclematerialgroup::getGroup_bind_material_status, GroupBindMaterialStatusEnum.BOUND.getValue())
+                .eq(SchBaseVehiclematerialgroup::getGroup_status, GroupStatusEnum.IN_STORAGE.getType())
+                .eq(SchBaseVehiclematerialgroup::getLink_status, LinkStatusEnum.LINK_FINISH.getType())
+                .orderByDesc(SchBaseVehiclematerialgroup::getPcsn, SchBaseVehiclematerialgroup::getUpdate_time);
+        List<SchBaseVehiclematerialgroup> list = vehiclematerialgroupService.list(lqw);
+        List<VehicleLinkVo> vehicleLinkVoList = new ArrayList<>();
+        for (SchBaseVehiclematerialgroup group : list) {
+            VehicleLinkVo vehicleLinkVo = new VehicleLinkVo();
+            vehicleLinkVo.setMaterial_id(group.getMaterial_id());
+            vehicleLinkVo.setGroup_id(group.getGroup_id());
+            vehicleLinkVo.setVehicle_code(group.getVehicle_code());
+            vehicleLinkVo.setMaterial_name(group.getMaterial_name());
+            vehicleLinkVo.setPoint_code(group.getPoint_code());
+            vehicleLinkVo.setVehicle_type(group.getVehicle_type());
+            vehicleLinkVo.setMaterial_code(group.getMaterial_code());
+            vehicleLinkVoList.add(vehicleLinkVo);
+        }
+        return vehicleLinkVoList;
+    }
+
+    @Override
+    public List<PointVo> queryAllPoints() {
+        LambdaQueryWrapper<SchBasePoint> lqw = new LambdaQueryWrapper<>();
+        //除这些区域外 其它区域都存在定点流转任务
+        //叫料缓存区、组盘区、空托盘缓存区1、空托盘缓存区2、原材料
+        lqw.notIn(SchBasePoint::getRegion_code, "JLHC", "ZP", "KTPHC1", "KTPHC2", "YCL")
+                .eq(SchBasePoint::getIs_used, true);
+        List<PointVo> list = this.copyPointVoList(pointService.list(lqw));
+        for (PointVo pointVo : list) {
+            List<PointVo> end_points = pointVo.getEnd_points();
+            SchBasePoint point = pointService.getOne(new LambdaQueryWrapper<SchBasePoint>().eq(SchBasePoint::getPoint_code, pointVo.getPoint_code()).eq(SchBasePoint::getIs_used, true));
+            String[] nextPointCodes = point.getNext_point_code().split(",");
+            for (int i = 0; i < nextPointCodes.length; i++) {
+                String nextPointCode = nextPointCodes[i];
+                SchBasePoint one = pointService.getOne(new LambdaQueryWrapper<SchBasePoint>().eq(SchBasePoint::getPoint_code, nextPointCode).eq(SchBasePoint::getIs_used, true));
+                PointVo pv = new PointVo();
+                pv.setPoint_code(one.getPoint_code());
+                pv.setPoint_name(one.getPoint_name());
+                end_points.add(pv);
+            }
+        }
+        return list;
+    }
+
+    @Override
+    public PdaResponseVo createP2pTask(FullVehicleOutDto requestParam) {
+        Assert.notNull(requestParam, "参数不能为空!");
+        this.checkNextPoint(requestParam.getPoint_code1(), requestParam.getPoint_code2());
+        JSONObject param = new JSONObject();
+        param.put("device_code", requestParam.getPoint_code1());
+        param.put("device_code2", requestParam.getPoint_code2());
+        param.put("config_code", "P2PTask");
+        param.put("requestNo", IdUtil.simpleUUID());
+        param.put("user_id", "1");
+        taskService.apply(param);
+        return PdaResponseVo.pdaResultOk("创建点对点任务请求成功");
+    }
+
+    @Override
+    public List<PointVo> copyPointVoList(List<SchBasePoint> list) {
+        List<PointVo> pointVoList = new ArrayList<>();
+        for (SchBasePoint point : list) {
+            PointVo pointVo = new PointVo();
+            pointVo.setPoint_code(point.getPoint_code());
+            pointVo.setPoint_name(point.getPoint_name());
+            pointVoList.add(pointVo);
+        }
+        return pointVoList;
+    }
+
+    /**
+     * 定点任务判断是否配置下一点位
+     *
+     * @param start_point_code
+     */
+    private void checkNextPoint(String start_point_code, String end_point_code) {
+        SchBasePoint point = pointService.getById(start_point_code);
+        Assert.notNull(point, "起点有误,起点不存在!");
+        String next_point_code = point.getNext_point_code();
+        Assert.notBlank(next_point_code, "起点未配置下一点位信息!");
+        if (StrUtil.isNotEmpty(end_point_code)) {
+            List<String> next_point_code_list = Arrays.stream(end_point_code.split(",")).collect(Collectors.toList());
+            if (!next_point_code_list.contains(end_point_code)) {
+                throw new BadRequestException("该定点任务有误,所选终点在下一点位配置信息中不存在!");
+            }
+        }
+    }
+
+    /**
+     * 校验余料数量是否是0.5的整数倍数
+     *
+     * @param groupOne
+     * @param residue_num
+     */
+    private void checkQty(SchBaseVehiclematerialgroup groupOne, String residue_num) {
+        String regex = "^\\d+(\\.\\d+)?0*$";
+        Assert.isFalse(Pattern.matches(regex, residue_num), "余料数量有误,不是0.5的整数倍");
+        try {
+            double residueNum = Double.parseDouble(residue_num);
+            double material_qty = Double.parseDouble(groupOne.getMaterial_qty());
+            if (residueNum < 0 || residueNum > material_qty) {
+                throw new BadRequestException("回库余料数量不符合要求,大于原有数量或者小于0!");
+            }
+        } catch (Exception e) {
+            throw new IllegalArgumentException("输入数据有误: " + residue_num, e);
+        }
+    }
+
+
     @Override
     public List<DropdownListVo> getDeviceInfo() {
         // 暂定压机区域
@@ -85,44 +390,6 @@ public class PdaServiceImpl implements PdaService {
         return pdaMapper.getDictByCode("device_action");
     }
 
-    @Override
-    public PdaResponseVo manualCreateByPda(ManualGroupDto entity) {
-        if (ObjectUtil.isEmpty(entity)) {
-            throw new BadRequestException("组盘不能为空");
-        }
-        SchBaseVehiclematerialgroup groupInfo = vehiclematerialgroupService.getGroupInfo(entity.getVehicle_code(),
-                entity.getVehicle_type(), GroupBindMaterialStatusEnum.BOUND.getValue());
-        if (ObjectUtil.isNotEmpty(groupInfo)) {
-            throw new BadRequestException("组盘信息已存在");
-        }
-        // 获取压机工单
-        PdmBdWorkorder bdWorkorder = workorderService.getDeviceProductionTask(entity.getPoint_code());
-        // 获取点位
-        SchBasePoint basePoint = pointService.getById(entity.getPoint_code());
-        // 获取物料
-        MdBaseMaterial material = materialService.getById(bdWorkorder.getMaterial_id());
-        SchBaseVehiclematerialgroup group = new SchBaseVehiclematerialgroup();
-        group.setGroup_id(IdUtil.getSnowflake(1, 1).nextIdStr());
-        group.setVehicle_type(entity.getVehicle_type());
-        group.setVehicle_code(entity.getVehicle_code());
-        group.setMaterial_id(bdWorkorder.getMaterial_id());
-        group.setRedundance_material_code(bdWorkorder.getRaw_material_code());
-        group.setSource_vehicle_code(entity.getPoint_code());
-        group.setPoint_code(entity.getPoint_code());
-        group.setPoint_name(basePoint.getPoint_name());
-        group.setInstorage_time(DateUtil.now());
-        group.setStanding_time(material.getStanding_time());
-        group.setMaterial_weight(entity.getMaterial_weight());
-        group.setWorkorder_code(bdWorkorder.getWorkorder_code());
-        group.setGroup_status(GroupStatusEnum.IN_STORAGE.getType());
-        group.setMove_way(basePoint.getPoint_code());
-        group.setBuss_move_id(IdUtil.getSnowflake(1, 1).nextIdStr());
-        group.setCreate_id(SecurityUtils.getCurrentUserId());
-        group.setCreate_name(SecurityUtils.getCurrentNickName());
-        group.setCreate_time(DateUtil.now());
-        vehiclematerialgroupService.save(group);
-        return PdaResponseVo.pdaResultOk("组盘成功");
-    }
 
     @Override
     public List<DropdownListVo> getBlendingCode() {
@@ -171,10 +438,6 @@ public class PdaServiceImpl implements PdaService {
         return pdaMapper.forcedRestingShow();
     }
 
-    @Override
-    public List<DropdownListVo> getVehicleType() {
-        return pdaMapper.getDictByCode("vehicle_type");
-    }
 
     @Override
     public List<ManualWorkOrderVo> manualOrders() {
@@ -418,6 +681,7 @@ public class PdaServiceImpl implements PdaService {
         return PdaResponseVo.pdaResultOk("删除成功");
     }
 
+
     /**
      * 保存组盘信息
      *
@@ -435,7 +699,7 @@ public class PdaServiceImpl implements PdaService {
             group = new SchBaseVehiclematerialgroup();
             group.setGroup_id(IdUtil.getSnowflake(1, 1).nextIdStr());
         }
-        group.setMaterial_qty(Integer.valueOf(shelfSaveDto.getMaterial_qty()));
+        group.setMaterial_qty(shelfSaveDto.getMaterial_qty());
         group.setMaterial_id(shelfSaveDto.getMaterial_id());
         group.setGroup_bind_material_status(GroupBindMaterialStatusEnum.BOUND.getValue());
         group.setVehicle_code(shelfSaveDto.getVehicle_code());
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java
index 7cb732c..664ee08 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java
@@ -66,7 +66,7 @@ public class SchBaseVehiclematerialgroup implements Serializable {
     private Integer standing_time;
 
 
-    private Integer material_qty;
+    private String material_qty;
 
 
     private BigDecimal material_weight;
@@ -89,6 +89,8 @@ public class SchBaseVehiclematerialgroup implements Serializable {
 
     private String group_status;
 
+    private String link_status;
+
     private String move_way;
 
 
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupDto.java
index ed9dd2a..a0594da 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupDto.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupDto.java
@@ -209,4 +209,9 @@ public class SchBaseVehiclematerialgroupDto implements Serializable {
      * 泥料编码
      */
     private String raw_material_code;
+
+    /**
+     * 配盘状态 0待配盘 1配盘完成
+     */
+    private String link_status;
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java
index bd98d61..3f4032d 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dao/SchBasePoint.java
@@ -86,6 +86,8 @@ public class SchBasePoint implements Serializable {
 
     private String parent_point_code;
 
+    private String next_point_code;
+
 
     private String ext_point_code;
 
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
index 4eba7f5..4723a44 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpStatus;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -250,6 +251,7 @@ public abstract class AbstractTask {
         SchBaseTask task = new SchBaseTask();
         // 请求点
         String apply_point_code = param.getString("device_code");
+        String device_code2 = param.getString("device_code2");
         String config_code = param.getString("config_code");
         String requestNo = param.getString("requestNo");
         String vehicleType = param.getString("vehicle_type");
@@ -308,6 +310,10 @@ public abstract class AbstractTask {
         task.setRequest_param(JSONObject.toJSONString(param));
         // 设置创建人信息
         TaskUtils.setCreateByAcsOrPda(task, param);
+        //定点任务point_code2确定
+        if (StrUtil.isNotEmpty(device_code2)) {
+            task.setPoint_code2(device_code2);
+        }
         // 3、判断是否直接找点下发
         // 立即创建吧组盘放到具体位置，免得重复创建
         if (taskConfig.getIs_immediate_create()) {
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/GeneralDefinition.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/GeneralDefinition.java
index 0edd2eb..bcf1796 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/GeneralDefinition.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/GeneralDefinition.java
@@ -57,6 +57,14 @@ public class GeneralDefinition {
      * 钢托盘
      */
     public static final String STEEL_TRAY = "GTP";
+    /**
+     * 1500*1500载具
+     */
+    public static final String VEHICLE_TYPE_1500_1500 = "1";
+    /**
+     * 1500*1800载具
+     */
+    public static final String VEHICLE_TYPE_1500_1800 = "2";
     // 账号定义
     /**
      * acs系统
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/GroupBindMaterialStatusEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/GroupBindMaterialStatusEnum.java
index 506c1c9..6d7af28 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/GroupBindMaterialStatusEnum.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/GroupBindMaterialStatusEnum.java
@@ -14,7 +14,7 @@ public enum GroupBindMaterialStatusEnum {
     /**
      * 待绑定
      */
-    WAIT_BIND("1", "带绑定"),
+    WAIT_BIND("1", "待绑定"),
     /**
      * 已绑定
      */
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/GroupStatusEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/GroupStatusEnum.java
index babb5e1..fe48f40 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/GroupStatusEnum.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/GroupStatusEnum.java
@@ -12,29 +12,14 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum GroupStatusEnum {
     /**
-     * 系统外
+     * 组盘中
      */
-    OUT_SYSTEM("1", "系统外"),
+    OUT_SYSTEM("1", "未组盘"),
     /**
-     * 存储中
+     * 组盘完成
      */
-    IN_STORAGE("2", "存储中"),
-    /**
-     * 处理中
-     */
-    IN_PROCESS("3", "处理中"),
-    /**
-     * 搬运中
-     */
-    IN_CARRY("4", "搬运中"),
-    /**
-     * 可放料
-     */
-    DISCHARGE_MATERIAL("5", "可放料"),
-    /**
-     * 可取料
-     */
-    CABLE_RETRIEVABLE_MATERIAL("6", "可取料");
+    IN_STORAGE("2", "组盘完成");
+
 
     private final String type;
     private final String name;
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/LinkStatusEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/LinkStatusEnum.java
new file mode 100644
index 0000000..112eeca
--- /dev/null
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/enums/LinkStatusEnum.java
@@ -0,0 +1,25 @@
+package org.nl.wms.sch.task_manage.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @Author: lyd
+ * @Description: 配盘状态枚举
+ * @Date: 2023/5/24
+ */
+@Getter
+@AllArgsConstructor
+public enum LinkStatusEnum {
+    /**
+     * 未配盘
+     */
+    LINK_READY("0", "未配盘"),
+    /**
+     * 配盘完成
+     */
+    LINK_FINISH("1", "配盘完成");
+
+    private final String type;
+    private final String name;
+}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/lmzb/LMZBQKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/lmzb/LMZBQKTask.java
new file mode 100644
index 0000000..1ec5b88
--- /dev/null
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/lmzb/LMZBQKTask.java
@@ -0,0 +1,180 @@
+package org.nl.wms.sch.task_manage.task.tasks.lmzb;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.nl.common.exception.BadRequestException;
+import org.nl.system.service.notice.ISysNoticeService;
+import org.nl.wms.sch.point.service.ISchBasePointService;
+import org.nl.wms.sch.point.service.dao.SchBasePoint;
+import org.nl.wms.sch.task.service.ISchBaseTaskService;
+import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
+import org.nl.wms.sch.task.service.dao.SchBaseTask;
+import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
+import org.nl.wms.sch.task_manage.AbstractTask;
+import org.nl.wms.sch.task_manage.GeneralDefinition;
+import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
+import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
+import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
+import org.nl.wms.sch.task_manage.task.TaskType;
+import org.nl.wms.sch.task_manage.task.core.TaskStatus;
+import org.nl.wms.util.PointUtils;
+import org.nl.wms.util.TaskUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 蜡模制备区呼叫空托
+ *
+ * @author onepiece
+ */
+@Component(value = "LMZBQKTask")
+@TaskType("LMZBQKTask")
+public class LMZBQKTask extends AbstractTask {
+    private static final String TASK_CONFIG_CODE = "LMZBQKTask";
+    @Autowired
+    private ISchBasePointService pointService;
+    @Autowired
+    private ISchBaseTaskService taskService;
+    @Autowired
+    private ISchBaseTaskconfigService taskConfigService;
+    @Autowired
+    private ISysNoticeService noticeService;
+
+    @Override
+    public void create() throws BadRequestException {
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void createCompletion(SchBaseTask task) {
+        // 配置信息
+        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
+                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
+        TaskUtils.setUpdateByAcs(task);
+        List<String> startRegionStr = Arrays.stream(taskConfig.getStart_region_str().split(","))
+                .collect(Collectors.toList());
+        // 找起点
+        SchBasePoint point = findStartPoint(startRegionStr);
+        if (ObjectUtil.isEmpty(point)) {
+            // 消息通知
+            noticeService.createNotice("空托缓存2区暂无空托盘！", TASK_CONFIG_CODE + task.getPoint_code2(),
+                    NoticeTypeEnum.WARN.getCode());
+            throw new BadRequestException("空托缓存2区暂无空托盘！");
+        }
+        // 设置终点并修改创建成功状态
+        task.setPoint_code1(point.getPoint_code());
+        task.setRemark("");
+        task.setVehicle_qty(point.getVehicle_qty());
+        task.setVehicle_type(point.getCan_vehicle_type());
+        task.setTask_status(TaskStatus.CREATED.getCode());
+        taskService.save(task);
+        // 点位更新
+        point.setIng_task_code(task.getTask_code());
+        PointUtils.setUpdateByAcs(point);
+        pointService.updateById(point);
+    }
+
+    /**
+     * 从起点区域获取空托位
+     *
+     * @param startRegionStr
+     * @return
+     */
+    private SchBasePoint findStartPoint(List<String> startRegionStr) {
+        LambdaQueryWrapper<SchBasePoint> lam = new LambdaQueryWrapper<>();
+        // 默认一直都有载具
+        lam.in(SchBasePoint::getRegion_code, startRegionStr)
+                // 点位状态是空托
+                .eq(SchBasePoint::getPoint_status, PointStatusEnum.EMPTY_VEHICLE.getCode())
+                // 当前执行的任务为空或者NULL，有数据表示锁住
+                .and(la -> la.isNull(SchBasePoint::getIng_task_code)
+                        .or()
+                        .eq(SchBasePoint::getIng_task_code, ""))
+                .eq(SchBasePoint::getIs_used, true);
+        List<SchBasePoint> schBasePoints = pointService.list(lam);
+        return ObjectUtil.isNotEmpty(schBasePoints) ? schBasePoints.get(0) : null;
+    }
+
+    @Override
+    protected void updateStatus(String task_code, TaskStatus status) {
+        // 校验任务
+        SchBaseTask taskObj = taskService.getByCode(task_code);
+        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
+            throw new BadRequestException("该任务已完成!");
+        }
+        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
+            throw new BadRequestException("该任务已取消!");
+        }
+        // 根据传来的类型去对任务进行操作
+        if (status.equals(TaskStatus.EXECUTING)) {
+            taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
+            taskObj.setRemark("执行中");
+            TaskUtils.setUpdateByAcs(taskObj);
+            taskService.updateById(taskObj);
+        }
+        if (status.equals(TaskStatus.FINISHED)) {
+            this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
+        }
+        if (status.equals(TaskStatus.CANCELED)) {
+            this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
+        }
+    }
+
+    @Override
+    public void forceFinish(String task_code) {
+        SchBaseTask taskObj = taskService.getByCode(task_code);
+        if (ObjectUtil.isEmpty(taskObj)) {
+            throw new BadRequestException("该任务不存在");
+        }
+        this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
+    }
+
+    @Override
+    public void cancel(String task_code) {
+        SchBaseTask taskObj = taskService.getByCode(task_code);
+        if (ObjectUtil.isEmpty(taskObj)) {
+            throw new BadRequestException("该任务不存在");
+        }
+        this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
+        // 获取参数
+        SchBasePoint startPointObj = pointService.getById(taskObj.getPoint_code1());
+        // 起点清空
+        if (ObjectUtil.isNotEmpty(startPointObj)) {
+            PointUtils.setUpdateByType(startPointObj, taskFinishedType);
+            PointUtils.clearPoint(startPointObj);
+            //终点不需要记录点位状态和载具信息
+        }
+        // 任务完成
+        taskObj.setTask_status(TaskStatus.FINISHED.getCode());
+        taskObj.setRemark(GeneralDefinition.TASK_FINISH);
+        taskObj.setFinished_type(taskFinishedType.getCode());
+        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
+        taskService.updateById(taskObj);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
+        // 获取参数
+        SchBasePoint startPointObj = pointService.getById(taskObj.getPoint_code1());
+        // 起点解锁
+        if (ObjectUtil.isNotEmpty(startPointObj)) {
+            startPointObj.setIng_task_code("");
+            PointUtils.setUpdateByType(startPointObj, taskFinishedType);
+            pointService.updateById(startPointObj);
+        }
+        taskObj.setTask_status(TaskStatus.CANCELED.getCode());
+        taskObj.setRemark(GeneralDefinition.TASK_CANCEL);
+        taskObj.setFinished_type(taskFinishedType.getCode());
+        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
+        taskService.updateById(taskObj);
+    }
+}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/lmzp/LMZPQKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/lmzp/LMZPQKTask.java
new file mode 100644
index 0000000..aa31362
--- /dev/null
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/lmzp/LMZPQKTask.java
@@ -0,0 +1,180 @@
+package org.nl.wms.sch.task_manage.task.tasks.lmzp;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.nl.common.exception.BadRequestException;
+import org.nl.system.service.notice.ISysNoticeService;
+import org.nl.wms.sch.point.service.ISchBasePointService;
+import org.nl.wms.sch.point.service.dao.SchBasePoint;
+import org.nl.wms.sch.task.service.ISchBaseTaskService;
+import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
+import org.nl.wms.sch.task.service.dao.SchBaseTask;
+import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
+import org.nl.wms.sch.task_manage.AbstractTask;
+import org.nl.wms.sch.task_manage.GeneralDefinition;
+import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
+import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
+import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
+import org.nl.wms.sch.task_manage.task.TaskType;
+import org.nl.wms.sch.task_manage.task.core.TaskStatus;
+import org.nl.wms.util.PointUtils;
+import org.nl.wms.util.TaskUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 蜡模组盘区呼叫空托
+ *
+ * @author onepiece
+ */
+@Component(value = "LMZPQKTask")
+@TaskType("LMZPQKTask")
+public class LMZPQKTask extends AbstractTask {
+    private static final String TASK_CONFIG_CODE = "LMZPQKTask";
+    @Autowired
+    private ISchBasePointService pointService;
+    @Autowired
+    private ISchBaseTaskService taskService;
+    @Autowired
+    private ISchBaseTaskconfigService taskConfigService;
+    @Autowired
+    private ISysNoticeService noticeService;
+
+    @Override
+    public void create() throws BadRequestException {
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void createCompletion(SchBaseTask task) {
+        // 配置信息
+        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
+                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
+        TaskUtils.setUpdateByAcs(task);
+        List<String> startRegionStr = Arrays.stream(taskConfig.getStart_region_str().split(","))
+                .collect(Collectors.toList());
+        // 找起点
+        SchBasePoint point = findStartPoint(startRegionStr);
+        if (ObjectUtil.isEmpty(point)) {
+            // 消息通知
+            noticeService.createNotice("空托缓存1区暂无空托盘！", TASK_CONFIG_CODE + task.getPoint_code2(),
+                    NoticeTypeEnum.WARN.getCode());
+            throw new BadRequestException("空托缓存1区暂无空托盘！");
+        }
+        // 设置终点并修改创建成功状态
+        task.setPoint_code1(point.getPoint_code());
+        task.setRemark("");
+        task.setVehicle_qty(point.getVehicle_qty());
+        task.setVehicle_type(point.getCan_vehicle_type());
+        task.setTask_status(TaskStatus.CREATED.getCode());
+        taskService.save(task);
+        // 点位更新
+        point.setIng_task_code(task.getTask_code());
+        PointUtils.setUpdateByAcs(point);
+        pointService.updateById(point);
+    }
+
+    /**
+     * 从起点区域获取空托位
+     *
+     * @param startRegionStr
+     * @return
+     */
+    private SchBasePoint findStartPoint(List<String> startRegionStr) {
+        LambdaQueryWrapper<SchBasePoint> lam = new LambdaQueryWrapper<>();
+        // 默认一直都有载具
+        lam.in(SchBasePoint::getRegion_code, startRegionStr)
+                // 点位状态是空托
+                .eq(SchBasePoint::getPoint_status, PointStatusEnum.EMPTY_VEHICLE.getCode())
+                // 当前执行的任务为空或者NULL，有数据表示锁住
+                .and(la -> la.isNull(SchBasePoint::getIng_task_code)
+                        .or()
+                        .eq(SchBasePoint::getIng_task_code, ""))
+                .eq(SchBasePoint::getIs_used, true);
+        List<SchBasePoint> schBasePoints = pointService.list(lam);
+        return ObjectUtil.isNotEmpty(schBasePoints) ? schBasePoints.get(0) : null;
+    }
+
+    @Override
+    protected void updateStatus(String task_code, TaskStatus status) {
+        // 校验任务
+        SchBaseTask taskObj = taskService.getByCode(task_code);
+        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
+            throw new BadRequestException("该任务已完成!");
+        }
+        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
+            throw new BadRequestException("该任务已取消!");
+        }
+        // 根据传来的类型去对任务进行操作
+        if (status.equals(TaskStatus.EXECUTING)) {
+            taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
+            taskObj.setRemark("执行中");
+            TaskUtils.setUpdateByAcs(taskObj);
+            taskService.updateById(taskObj);
+        }
+        if (status.equals(TaskStatus.FINISHED)) {
+            this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
+        }
+        if (status.equals(TaskStatus.CANCELED)) {
+            this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
+        }
+    }
+
+    @Override
+    public void forceFinish(String task_code) {
+        SchBaseTask taskObj = taskService.getByCode(task_code);
+        if (ObjectUtil.isEmpty(taskObj)) {
+            throw new BadRequestException("该任务不存在");
+        }
+        this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
+    }
+
+    @Override
+    public void cancel(String task_code) {
+        SchBaseTask taskObj = taskService.getByCode(task_code);
+        if (ObjectUtil.isEmpty(taskObj)) {
+            throw new BadRequestException("该任务不存在");
+        }
+        this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
+        // 获取参数
+        SchBasePoint startPointObj = pointService.getById(taskObj.getPoint_code1());
+        // 起点清空
+        if (ObjectUtil.isNotEmpty(startPointObj)) {
+            PointUtils.setUpdateByType(startPointObj, taskFinishedType);
+            PointUtils.clearPoint(startPointObj);
+            //终点不需要记录点位状态和载具信息
+        }
+        // 任务完成
+        taskObj.setTask_status(TaskStatus.FINISHED.getCode());
+        taskObj.setRemark(GeneralDefinition.TASK_FINISH);
+        taskObj.setFinished_type(taskFinishedType.getCode());
+        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
+        taskService.updateById(taskObj);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
+        // 获取参数
+        SchBasePoint startPointObj = pointService.getById(taskObj.getPoint_code1());
+        // 起点解锁
+        if (ObjectUtil.isNotEmpty(startPointObj)) {
+            startPointObj.setIng_task_code("");
+            PointUtils.setUpdateByType(startPointObj, taskFinishedType);
+            pointService.updateById(startPointObj);
+        }
+        taskObj.setTask_status(TaskStatus.CANCELED.getCode());
+        taskObj.setRemark(GeneralDefinition.TASK_CANCEL);
+        taskObj.setFinished_type(taskFinishedType.getCode());
+        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
+        taskService.updateById(taskObj);
+    }
+}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/p2p/P2PTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/p2p/P2PTask.java
new file mode 100644
index 0000000..bd386d3
--- /dev/null
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/p2p/P2PTask.java
@@ -0,0 +1,210 @@
+package org.nl.wms.sch.task_manage.task.tasks.p2p;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.nl.common.exception.BadRequestException;
+import org.nl.system.service.notice.ISysNoticeService;
+import org.nl.wms.sch.point.service.ISchBasePointService;
+import org.nl.wms.sch.point.service.dao.SchBasePoint;
+import org.nl.wms.sch.task.service.ISchBaseTaskService;
+import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
+import org.nl.wms.sch.task.service.dao.SchBaseTask;
+import org.nl.wms.sch.task_manage.AbstractTask;
+import org.nl.wms.sch.task_manage.GeneralDefinition;
+import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum;
+import org.nl.wms.sch.task_manage.enums.PointStatusEnum;
+import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum;
+import org.nl.wms.sch.task_manage.task.TaskType;
+import org.nl.wms.sch.task_manage.task.core.TaskStatus;
+import org.nl.wms.util.PointUtils;
+import org.nl.wms.util.TaskUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 手持点对点任务
+ * 流转点位
+ * 如果手持指定终点则使用该终点
+ * 如果手持未指定终点，则根据点位表中配置的下一点位信息进行查找
+ *
+ * @author onepiece
+ */
+@Component(value = "P2PTask")
+@TaskType("P2PTask")
+public class P2PTask extends AbstractTask {
+    private static final String TASK_CONFIG_CODE = "P2PTask";
+    @Autowired
+    private ISchBasePointService pointService;
+    @Autowired
+    private ISchBaseTaskService taskService;
+    @Autowired
+    private ISysNoticeService noticeService;
+
+    @Override
+    public void create() throws BadRequestException {
+    }
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void createCompletion(SchBaseTask task) {
+        TaskUtils.setUpdateByAcs(task);
+        String point_code2 = task.getPoint_code2();
+        SchBasePoint endPoint = null;
+        if (StrUtil.isEmpty(point_code2)) {
+            endPoint = findEndPoint(task.getPoint_code1());
+        } else {
+            LambdaQueryWrapper<SchBasePoint> lqw = new LambdaQueryWrapper<>();
+            lqw.eq(SchBasePoint::getPoint_code, point_code2)
+                    .and(la -> la.isNull(SchBasePoint::getIng_task_code)
+                            .or()
+                            .eq(SchBasePoint::getIng_task_code, ""))
+                    .eq(SchBasePoint::getIs_used, true);
+            endPoint = pointService.getOne(lqw);
+        }
+        if (ObjectUtil.isEmpty(endPoint)) {
+            // 消息通知
+            noticeService.createNotice("任务创建失败,该点位存在任务！", TASK_CONFIG_CODE + task.getPoint_code1(),
+                    NoticeTypeEnum.WARN.getCode());
+            throw new BadRequestException("任务创建失败，该点位存在任务！");
+        }
+        // 设置终点并修改创建成功状态
+        task.setPoint_code2(endPoint.getPoint_code());
+        task.setRemark("");
+        task.setVehicle_qty(endPoint.getVehicle_qty());
+        task.setVehicle_type(endPoint.getCan_vehicle_type());
+        task.setTask_status(TaskStatus.CREATED.getCode());
+        taskService.save(task);
+        // 点位更新
+        endPoint.setIng_task_code(task.getTask_code());
+        PointUtils.setUpdateByAcs(endPoint);
+        pointService.updateById(endPoint);
+    }
+
+    /**
+     * 根据起点去找终点
+     * 为了方便点对点任务
+     * 需要在对应起点配置下一点位
+     *
+     * @param startPointCode
+     * @return
+     */
+    private SchBasePoint findEndPoint(String startPointCode) {
+        SchBasePoint startPoint = pointService.getOne(new LambdaQueryWrapper<SchBasePoint>().eq(SchBasePoint::getPoint_code, startPointCode));
+        if (startPoint != null) {
+            List<String> nextPointCodes = Arrays.stream(startPoint.getNext_point_code().split(",")).collect(Collectors.toList());
+            LambdaQueryWrapper<SchBasePoint> lqw = new LambdaQueryWrapper();
+            lqw.in(SchBasePoint::getPoint_code, nextPointCodes)
+                    .and(la -> la.isNull(SchBasePoint::getPoint_status)
+                            .or()
+                            .eq(SchBasePoint::getPoint_status, "")
+                            .or()
+                            .eq(SchBasePoint::getPoint_status, PointStatusEnum.EMPTY_POINT))
+                    .and(la -> la.isNull(SchBasePoint::getIng_task_code)
+                            .or()
+                            .eq(SchBasePoint::getIng_task_code, ""))
+                    .eq(SchBasePoint::getIs_used, true);
+            List<SchBasePoint> schBasePoints = pointService.list(lqw);
+            return ObjectUtil.isNotEmpty(schBasePoints) ? schBasePoints.get(0) : null;
+        }
+        return null;
+    }
+
+
+    @Override
+    protected void updateStatus(String task_code, TaskStatus status) {
+        // 校验任务
+        SchBaseTask taskObj = taskService.getByCode(task_code);
+        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
+            throw new BadRequestException("该任务已完成!");
+        }
+        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
+            throw new BadRequestException("该任务已取消!");
+        }
+        // 根据传来的类型去对任务进行操作
+        if (status.equals(TaskStatus.EXECUTING)) {
+            taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
+            taskObj.setRemark("执行中");
+            TaskUtils.setUpdateByAcs(taskObj);
+            taskService.updateById(taskObj);
+        }
+        if (status.equals(TaskStatus.FINISHED)) {
+            this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
+        }
+        if (status.equals(TaskStatus.CANCELED)) {
+            this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
+        }
+    }
+
+    @Override
+    public void forceFinish(String task_code) {
+        SchBaseTask taskObj = taskService.getByCode(task_code);
+        if (ObjectUtil.isEmpty(taskObj)) {
+            throw new BadRequestException("该任务不存在");
+        }
+        this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
+    }
+
+    @Override
+    public void cancel(String task_code) {
+        SchBaseTask taskObj = taskService.getByCode(task_code);
+        if (ObjectUtil.isEmpty(taskObj)) {
+            throw new BadRequestException("该任务不存在");
+        }
+        this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
+        // 获取参数
+        SchBasePoint startPointObj = pointService.getById(taskObj.getPoint_code1());
+        // 起点清空
+        if (ObjectUtil.isNotEmpty(startPointObj)) {
+            PointUtils.setUpdateByType(startPointObj, taskFinishedType);
+            PointUtils.clearPoint(startPointObj);
+            //终点不需要记录点位状态和载具信息
+            //如果终点是空托盘缓存1区或者空托盘缓存2区 则更改终点点位的状态
+            SchBasePoint endPointObj = pointService.getById(taskObj.getPoint_code2());
+            if (ObjectUtil.isNotEmpty(endPointObj)) {
+                if ("KTPHC1".equals(endPointObj.getRegion_code()) || "KTPHC2".equals(endPointObj.getRegion_code())) {
+                    endPointObj.setPoint_status(PointStatusEnum.EMPTY_VEHICLE.getCode());
+                    //endPointObj.setVehicle_type(GeneralDefinition.VEHICLE_TYPE_1500_1500);
+                    //endPointObj.setVehicle_qty(taskObj.getVehicle_qty());
+                    endPointObj.setUpdate_time(DateUtil.now());
+                    PointUtils.setUpdateByType(endPointObj, taskFinishedType);
+                    pointService.updateById(endPointObj);
+                }
+            }
+        }
+        // 任务完成
+        taskObj.setTask_status(TaskStatus.FINISHED.getCode());
+        taskObj.setRemark(GeneralDefinition.TASK_FINISH);
+        taskObj.setFinished_type(taskFinishedType.getCode());
+        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
+        taskService.updateById(taskObj);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
+        // 获取参数
+        SchBasePoint startPointObj = pointService.getById(taskObj.getPoint_code1());
+        // 起点解锁
+        if (ObjectUtil.isNotEmpty(startPointObj)) {
+            startPointObj.setIng_task_code("");
+            PointUtils.setUpdateByType(startPointObj, taskFinishedType);
+            pointService.updateById(startPointObj);
+        }
+        taskObj.setTask_status(TaskStatus.CANCELED.getCode());
+        taskObj.setRemark(GeneralDefinition.TASK_CANCEL);
+        taskObj.setFinished_type(taskFinishedType.getCode());
+        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
+        taskService.updateById(taskObj);
+    }
+}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/ycl/JLHCHKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/ycl/JLHCHKTask.java
new file mode 100644
index 0000000..8042ea4
--- /dev/null
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/ycl/JLHCHKTask.java
@@ -0,0 +1,202 @@
+package org.nl.wms.sch.task_manage.task.tasks.ycl;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.nl.common.exception.BadRequestException;
+import org.nl.system.service.notice.ISysNoticeService;
+import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService;
+import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup;
+import org.nl.wms.sch.point.service.ISchBasePointService;
+import org.nl.wms.sch.point.service.dao.SchBasePoint;
+import org.nl.wms.sch.task.service.ISchBaseTaskService;
+import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
+import org.nl.wms.sch.task.service.dao.SchBaseTask;
+import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
+import org.nl.wms.sch.task_manage.AbstractTask;
+import org.nl.wms.sch.task_manage.GeneralDefinition;
+import org.nl.wms.sch.task_manage.enums.*;
+import org.nl.wms.sch.task_manage.task.TaskType;
+import org.nl.wms.sch.task_manage.task.core.TaskStatus;
+import org.nl.wms.util.PointUtils;
+import org.nl.wms.util.TaskUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 叫料缓存区回库任务(剩余物料或空托盘)
+ *
+ * @author onepiece
+ */
+@Component(value = "JLHCHKTask")
+@TaskType("JLHCHKTask")
+public class JLHCHKTask extends AbstractTask {
+    private static final String TASK_CONFIG_CODE = "JLHCHKTask";
+    @Autowired
+    private ISchBasePointService pointService;
+    @Autowired
+    private ISchBaseTaskService taskService;
+    @Autowired
+    private ISchBaseTaskconfigService taskConfigService;
+    @Autowired
+    private ISysNoticeService noticeService;
+    @Autowired
+    private ISchBaseVehiclematerialgroupService vehiclematerialgroupService;
+
+    @Override
+    public void create() throws BadRequestException {
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void createCompletion(SchBaseTask task) {
+        // 配置信息
+        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
+                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
+        TaskUtils.setUpdateByAcs(task);
+        List<String> nextRegionStr = Arrays.stream(taskConfig.getNext_region_str().split(","))
+                .collect(Collectors.toList());
+        // 找终点
+        SchBasePoint point = findNextPoint(nextRegionStr);
+        if (ObjectUtil.isEmpty(point)) {
+            // 消息通知
+            noticeService.createNotice("原材料库没有空位！", TASK_CONFIG_CODE + task.getPoint_code2(),
+                    NoticeTypeEnum.WARN.getCode());
+            throw new BadRequestException("原材料库没有空位！");
+        }
+        // 设置终点并修改创建成功状态
+        task.setPoint_code2(point.getPoint_code());
+        task.setRemark("");
+        task.setVehicle_qty(point.getVehicle_qty());
+        task.setVehicle_type(point.getCan_vehicle_type());
+        task.setTask_status(TaskStatus.CREATED.getCode());
+        taskService.save(task);
+        // 点位更新
+        point.setIng_task_code(task.getTask_code());
+        PointUtils.setUpdateByAcs(point);
+        pointService.updateById(point);
+    }
+
+    /**
+     * 从终点区域查询空位
+     *
+     * @param nextRegionStr
+     * @return
+     */
+    private SchBasePoint findNextPoint(List<String> nextRegionStr) {
+        LambdaQueryWrapper<SchBasePoint> lam = new LambdaQueryWrapper<>();
+        // 默认一直都有载具
+        lam.in(SchBasePoint::getRegion_code, nextRegionStr)
+                // 点位状态是空托
+                .eq(SchBasePoint::getPoint_status, PointStatusEnum.EMPTY_POINT.getCode())
+                // 当前执行的任务为空或者NULL，有数据表示锁住
+                .and(la -> la.isNull(SchBasePoint::getIng_task_code)
+                        .or()
+                        .eq(SchBasePoint::getIng_task_code, ""))
+                .eq(SchBasePoint::getIs_used, true);
+        List<SchBasePoint> schBasePoints = pointService.list(lam);
+        return ObjectUtil.isNotEmpty(schBasePoints) ? schBasePoints.get(0) : null;
+    }
+
+    @Override
+    protected void updateStatus(String task_code, TaskStatus status) {
+        // 校验任务
+        SchBaseTask taskObj = taskService.getByCode(task_code);
+        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
+            throw new BadRequestException("该任务已完成!");
+        }
+        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
+            throw new BadRequestException("该任务已取消!");
+        }
+        // 根据传来的类型去对任务进行操作
+        if (status.equals(TaskStatus.EXECUTING)) {
+            taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
+            taskObj.setRemark("执行中");
+            TaskUtils.setUpdateByAcs(taskObj);
+            taskService.updateById(taskObj);
+        }
+        if (status.equals(TaskStatus.FINISHED)) {
+            this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
+        }
+        if (status.equals(TaskStatus.CANCELED)) {
+            this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
+        }
+    }
+
+    @Override
+    public void forceFinish(String task_code) {
+        SchBaseTask taskObj = taskService.getByCode(task_code);
+        if (ObjectUtil.isEmpty(taskObj)) {
+            throw new BadRequestException("该任务不存在");
+        }
+        this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
+    }
+
+    @Override
+    public void cancel(String task_code) {
+        SchBaseTask taskObj = taskService.getByCode(task_code);
+        if (ObjectUtil.isEmpty(taskObj)) {
+            throw new BadRequestException("该任务不存在");
+        }
+        this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
+        // 获取参数
+        SchBasePoint startPointObj = pointService.getById(taskObj.getPoint_code1());
+        // 起点清空
+        if (ObjectUtil.isNotEmpty(startPointObj)) {
+            PointUtils.setUpdateByType(startPointObj, taskFinishedType);
+            PointUtils.clearPoint(startPointObj);
+            //更新终点的点位信息
+            //更新组盘表载具对应的点位信息
+            SchBasePoint endPointObj = pointService.getById(taskObj.getPoint_code2());
+            if (ObjectUtil.isNotEmpty(endPointObj)) {
+                endPointObj.setPoint_status(PointStatusEnum.FULL_POINT.getCode());
+                endPointObj.setVehicle_type(endPointObj.getCan_vehicle_type());
+                endPointObj.setVehicle_qty(taskObj.getVehicle_qty());
+                endPointObj.setUpdate_time(DateUtil.now());
+                PointUtils.setUpdateByType(endPointObj, taskFinishedType);
+                pointService.updateById(endPointObj);
+
+                SchBaseVehiclematerialgroup vehiclematerialgroup = vehiclematerialgroupService.getById(taskObj.getGroup_id());
+                TaskUtils.setGroupUpdateByType(vehiclematerialgroup, taskFinishedType);
+                vehiclematerialgroup.setTask_code(taskObj.getTask_code());
+                vehiclematerialgroup.setBuss_move_id(taskObj.getTask_code());
+                vehiclematerialgroup.setPoint_code(endPointObj.getPoint_code());
+                vehiclematerialgroup.setPoint_name(endPointObj.getPoint_name());
+                vehiclematerialgroup.setMove_way(taskObj.getPoint_code1() + "->" + taskObj.getPoint_code2());
+                vehiclematerialgroupService.updateById(vehiclematerialgroup);
+            }
+        }
+        // 任务完成
+        taskObj.setTask_status(TaskStatus.FINISHED.getCode());
+        taskObj.setRemark(GeneralDefinition.TASK_FINISH);
+        taskObj.setFinished_type(taskFinishedType.getCode());
+        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
+        taskService.updateById(taskObj);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
+        // 获取参数
+        SchBasePoint startPointObj = pointService.getById(taskObj.getPoint_code1());
+        // 起点解锁
+        if (ObjectUtil.isNotEmpty(startPointObj)) {
+            startPointObj.setIng_task_code("");
+            PointUtils.setUpdateByType(startPointObj, taskFinishedType);
+            pointService.updateById(startPointObj);
+        }
+        taskObj.setTask_status(TaskStatus.CANCELED.getCode());
+        taskObj.setRemark(GeneralDefinition.TASK_CANCEL);
+        taskObj.setFinished_type(taskFinishedType.getCode());
+        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
+        taskService.updateById(taskObj);
+    }
+}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/ycl/JLHCQMTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/ycl/JLHCQMTask.java
new file mode 100644
index 0000000..9b2c5ec
--- /dev/null
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/ycl/JLHCQMTask.java
@@ -0,0 +1,194 @@
+package org.nl.wms.sch.task_manage.task.tasks.ycl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.nl.common.exception.BadRequestException;
+import org.nl.system.service.notice.ISysNoticeService;
+import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService;
+import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup;
+import org.nl.wms.sch.point.service.ISchBasePointService;
+import org.nl.wms.sch.point.service.dao.SchBasePoint;
+import org.nl.wms.sch.task.service.ISchBaseTaskService;
+import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
+import org.nl.wms.sch.task.service.dao.SchBaseTask;
+import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
+import org.nl.wms.sch.task_manage.AbstractTask;
+import org.nl.wms.sch.task_manage.GeneralDefinition;
+import org.nl.wms.sch.task_manage.enums.*;
+import org.nl.wms.sch.task_manage.task.TaskType;
+import org.nl.wms.sch.task_manage.task.core.TaskStatus;
+import org.nl.wms.util.PointUtils;
+import org.nl.wms.util.TaskUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 叫料缓存区取满托任务
+ *
+ * @author onepiece
+ */
+@Component(value = "JLHCQMTask")
+@TaskType("JLHCQMTask")
+public class JLHCQMTask extends AbstractTask {
+    private static final String TASK_CONFIG_CODE = "JLHCQMTask";
+    @Autowired
+    private ISchBasePointService pointService;
+    @Autowired
+    private ISchBaseTaskService taskService;
+    @Autowired
+    private ISchBaseTaskconfigService taskConfigService;
+    @Autowired
+    private ISysNoticeService noticeService;
+    @Autowired
+    private ISchBaseVehiclematerialgroupService vehiclematerialgroupService;
+
+    @Override
+    public void create() throws BadRequestException {
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void createCompletion(SchBaseTask task) {
+        // 配置信息
+        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
+                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
+        TaskUtils.setUpdateByAcs(task);
+        List<String> startRegionStr = Arrays.stream(taskConfig.getStart_region_str().split(","))
+                .collect(Collectors.toList());
+        // 找起点
+        SchBasePoint point = findStartPoint(startRegionStr);
+        if (ObjectUtil.isEmpty(point)) {
+            // 消息通知
+            noticeService.createNotice("原材料库没有满托！", TASK_CONFIG_CODE + task.getPoint_code2(),
+                    NoticeTypeEnum.WARN.getCode());
+            throw new BadRequestException("原材料库没有满托！");
+        }
+        // 设置终点并修改创建成功状态
+        task.setPoint_code1(point.getPoint_code());
+        task.setRemark("");
+        task.setVehicle_qty(point.getVehicle_qty());
+        task.setVehicle_type(point.getCan_vehicle_type());
+        task.setTask_status(TaskStatus.CREATED.getCode());
+        taskService.save(task);
+        // 点位更新
+        point.setIng_task_code(task.getTask_code());
+        PointUtils.setUpdateByAcs(point);
+        pointService.updateById(point);
+    }
+
+    /**
+     * 从起点区域获取空托位
+     *
+     * @param startRegionStr
+     * @return
+     */
+    private SchBasePoint findStartPoint(List<String> startRegionStr) {
+        LambdaQueryWrapper<SchBasePoint> lam = new LambdaQueryWrapper<>();
+        // 默认一直都有载具
+        lam.in(SchBasePoint::getRegion_code, startRegionStr)
+                // 点位状态是空托
+                .eq(SchBasePoint::getPoint_status, PointStatusEnum.EMPTY_VEHICLE.getCode())
+                // 当前执行的任务为空或者NULL，有数据表示锁住
+                .and(la -> la.isNull(SchBasePoint::getIng_task_code)
+                        .or()
+                        .eq(SchBasePoint::getIng_task_code, ""))
+                .eq(SchBasePoint::getIs_used, true);
+        List<SchBasePoint> schBasePoints = pointService.list(lam);
+        return ObjectUtil.isNotEmpty(schBasePoints) ? schBasePoints.get(0) : null;
+    }
+
+    @Override
+    protected void updateStatus(String task_code, TaskStatus status) {
+        // 校验任务
+        SchBaseTask taskObj = taskService.getByCode(task_code);
+        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
+            throw new BadRequestException("该任务已完成!");
+        }
+        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
+            throw new BadRequestException("该任务已取消!");
+        }
+        // 根据传来的类型去对任务进行操作
+        if (status.equals(TaskStatus.EXECUTING)) {
+            taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
+            taskObj.setRemark("执行中");
+            TaskUtils.setUpdateByAcs(taskObj);
+            taskService.updateById(taskObj);
+        }
+        if (status.equals(TaskStatus.FINISHED)) {
+            this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
+        }
+        if (status.equals(TaskStatus.CANCELED)) {
+            this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
+        }
+    }
+
+    @Override
+    public void forceFinish(String task_code) {
+        SchBaseTask taskObj = taskService.getByCode(task_code);
+        if (ObjectUtil.isEmpty(taskObj)) {
+            throw new BadRequestException("该任务不存在");
+        }
+        this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
+    }
+
+    @Override
+    public void cancel(String task_code) {
+        SchBaseTask taskObj = taskService.getByCode(task_code);
+        if (ObjectUtil.isEmpty(taskObj)) {
+            throw new BadRequestException("该任务不存在");
+        }
+        this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
+        // 获取参数
+        SchBasePoint startPointObj = pointService.getById(taskObj.getPoint_code1());
+        // 起点清空
+        if (ObjectUtil.isNotEmpty(startPointObj)) {
+            PointUtils.setUpdateByType(startPointObj, taskFinishedType);
+            PointUtils.clearPoint(startPointObj);
+            //终点不需要记录点位状态和载具信息
+            //但是需要更新组盘表中载具所在的点位信息
+            SchBasePoint endPointObj = pointService.getById(taskObj.getPoint_code2());
+            if (ObjectUtil.isNotEmpty(endPointObj)) {
+                SchBaseVehiclematerialgroup vehiclematerialgroup = vehiclematerialgroupService.getById(taskObj.getGroup_id());
+                TaskUtils.setGroupUpdateByType(vehiclematerialgroup, taskFinishedType);
+                vehiclematerialgroup.setTask_code(taskObj.getTask_code());
+                vehiclematerialgroup.setBuss_move_id(taskObj.getTask_code());
+                vehiclematerialgroup.setPoint_code(endPointObj.getPoint_code());
+                vehiclematerialgroup.setPoint_name(endPointObj.getPoint_name());
+                vehiclematerialgroup.setMove_way(taskObj.getPoint_code1() + "->" + taskObj.getPoint_code2());
+                vehiclematerialgroupService.updateById(vehiclematerialgroup);
+            }
+        }
+        // 任务完成
+        taskObj.setTask_status(TaskStatus.FINISHED.getCode());
+        taskObj.setRemark(GeneralDefinition.TASK_FINISH);
+        taskObj.setFinished_type(taskFinishedType.getCode());
+        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
+        taskService.updateById(taskObj);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
+        // 获取参数
+        SchBasePoint startPointObj = pointService.getById(taskObj.getPoint_code1());
+        // 起点解锁
+        if (ObjectUtil.isNotEmpty(startPointObj)) {
+            startPointObj.setIng_task_code("");
+            PointUtils.setUpdateByType(startPointObj, taskFinishedType);
+            pointService.updateById(startPointObj);
+        }
+        taskObj.setTask_status(TaskStatus.CANCELED.getCode());
+        taskObj.setRemark(GeneralDefinition.TASK_CANCEL);
+        taskObj.setFinished_type(taskFinishedType.getCode());
+        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
+        taskService.updateById(taskObj);
+    }
+}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/ycl/ZPQKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/ycl/ZPQKTask.java
new file mode 100644
index 0000000..8f50e31
--- /dev/null
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/ycl/ZPQKTask.java
@@ -0,0 +1,194 @@
+package org.nl.wms.sch.task_manage.task.tasks.ycl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.nl.common.exception.BadRequestException;
+import org.nl.system.service.notice.ISysNoticeService;
+import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService;
+import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup;
+import org.nl.wms.sch.point.service.ISchBasePointService;
+import org.nl.wms.sch.point.service.dao.SchBasePoint;
+import org.nl.wms.sch.task.service.ISchBaseTaskService;
+import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
+import org.nl.wms.sch.task.service.dao.SchBaseTask;
+import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
+import org.nl.wms.sch.task_manage.AbstractTask;
+import org.nl.wms.sch.task_manage.GeneralDefinition;
+import org.nl.wms.sch.task_manage.enums.*;
+import org.nl.wms.sch.task_manage.task.TaskType;
+import org.nl.wms.sch.task_manage.task.core.TaskStatus;
+import org.nl.wms.util.PointUtils;
+import org.nl.wms.util.TaskUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 组盘区取空托任务
+ *
+ * @author onepiece
+ */
+@Component(value = "ZPQKTask")
+@TaskType("ZPQKTask")
+public class ZPQKTask extends AbstractTask {
+    private static final String TASK_CONFIG_CODE = "ZPQKTask";
+    @Autowired
+    private ISchBasePointService pointService;
+    @Autowired
+    private ISchBaseTaskService taskService;
+    @Autowired
+    private ISchBaseTaskconfigService taskConfigService;
+    @Autowired
+    private ISysNoticeService noticeService;
+    @Autowired
+    private ISchBaseVehiclematerialgroupService vehiclematerialgroupService;
+
+    @Override
+    public void create() throws BadRequestException {
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void createCompletion(SchBaseTask task) {
+        // 配置信息
+        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
+                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
+        TaskUtils.setUpdateByAcs(task);
+        List<String> startRegionStr = Arrays.stream(taskConfig.getStart_region_str().split(","))
+                .collect(Collectors.toList());
+        // 找起点
+        SchBasePoint point = findStartPoint(startRegionStr);
+        if (ObjectUtil.isEmpty(point)) {
+            // 消息通知
+            noticeService.createNotice("原材料库中未查询到空托盘！", TASK_CONFIG_CODE + task.getPoint_code2(),
+                    NoticeTypeEnum.WARN.getCode());
+            throw new BadRequestException("原材料库中未查询到空托盘！");
+        }
+        // 设置起点并修改创建成功状态
+        task.setPoint_code1(point.getPoint_code());
+        task.setRemark("");
+        task.setVehicle_qty(point.getVehicle_qty());
+        task.setVehicle_type(point.getCan_vehicle_type());
+        task.setTask_status(TaskStatus.CREATED.getCode());
+        taskService.save(task);
+        // 点位更新
+        point.setIng_task_code(task.getTask_code());
+        PointUtils.setUpdateByAcs(point);
+        pointService.updateById(point);
+    }
+
+    /**
+     * 从起点区域获取空托位
+     *
+     * @param startRegionStr
+     * @return
+     */
+    private SchBasePoint findStartPoint(List<String> startRegionStr) {
+        LambdaQueryWrapper<SchBasePoint> lam = new LambdaQueryWrapper<>();
+        // 默认一直都有载具
+        lam.in(SchBasePoint::getRegion_code, startRegionStr)
+                // 点位状态是空托
+                .eq(SchBasePoint::getPoint_status, PointStatusEnum.EMPTY_VEHICLE.getCode())
+                // 当前执行的任务为空或者NULL，有数据表示锁住
+                .and(la -> la.isNull(SchBasePoint::getIng_task_code)
+                        .or()
+                        .eq(SchBasePoint::getIng_task_code, ""))
+                .eq(SchBasePoint::getIs_used, true);
+        List<SchBasePoint> schBasePoints = pointService.list(lam);
+        return ObjectUtil.isNotEmpty(schBasePoints) ? schBasePoints.get(0) : null;
+    }
+
+    @Override
+    protected void updateStatus(String task_code, TaskStatus status) {
+        // 校验任务
+        SchBaseTask taskObj = taskService.getByCode(task_code);
+        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
+            throw new BadRequestException("该任务已完成!");
+        }
+        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
+            throw new BadRequestException("该任务已取消!");
+        }
+        // 根据传来的类型去对任务进行操作
+        if (status.equals(TaskStatus.EXECUTING)) {
+            taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
+            taskObj.setRemark("执行中");
+            TaskUtils.setUpdateByAcs(taskObj);
+            taskService.updateById(taskObj);
+        }
+        if (status.equals(TaskStatus.FINISHED)) {
+            this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
+        }
+        if (status.equals(TaskStatus.CANCELED)) {
+            this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
+        }
+    }
+
+    @Override
+    public void forceFinish(String task_code) {
+        SchBaseTask taskObj = taskService.getByCode(task_code);
+        if (ObjectUtil.isEmpty(taskObj)) {
+            throw new BadRequestException("该任务不存在");
+        }
+        this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
+    }
+
+    @Override
+    public void cancel(String task_code) {
+        SchBaseTask taskObj = taskService.getByCode(task_code);
+        if (ObjectUtil.isEmpty(taskObj)) {
+            throw new BadRequestException("该任务不存在");
+        }
+        this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
+        // 获取参数
+        SchBasePoint startPointObj = pointService.getById(taskObj.getPoint_code1());
+        // 起点清空
+        if (ObjectUtil.isNotEmpty(startPointObj)) {
+            PointUtils.setUpdateByType(startPointObj, taskFinishedType);
+            PointUtils.clearPoint(startPointObj);
+            //终点不需要记录点位状态和载具信息
+            //但是需要更新组盘表中载具所在的点位信息
+            SchBasePoint endPointObj = pointService.getById(taskObj.getPoint_code2());
+            if (ObjectUtil.isNotEmpty(endPointObj)) {
+                SchBaseVehiclematerialgroup vehiclematerialgroup = vehiclematerialgroupService.getById(taskObj.getGroup_id());
+                TaskUtils.setGroupUpdateByType(vehiclematerialgroup, taskFinishedType);
+                vehiclematerialgroup.setTask_code(taskObj.getTask_code());
+                vehiclematerialgroup.setBuss_move_id(taskObj.getTask_code());
+                vehiclematerialgroup.setPoint_code(endPointObj.getPoint_code());
+                vehiclematerialgroup.setPoint_name(endPointObj.getPoint_name());
+                vehiclematerialgroup.setMove_way(taskObj.getPoint_code1() + "->" + taskObj.getPoint_code2());
+                vehiclematerialgroupService.updateById(vehiclematerialgroup);
+            }
+        }
+        // 任务完成
+        taskObj.setTask_status(TaskStatus.FINISHED.getCode());
+        taskObj.setRemark(GeneralDefinition.TASK_FINISH);
+        taskObj.setFinished_type(taskFinishedType.getCode());
+        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
+        taskService.updateById(taskObj);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
+        // 获取参数
+        SchBasePoint startPointObj = pointService.getById(taskObj.getPoint_code1());
+        // 起点解锁
+        if (ObjectUtil.isNotEmpty(startPointObj)) {
+            startPointObj.setIng_task_code("");
+            PointUtils.setUpdateByType(startPointObj, taskFinishedType);
+            pointService.updateById(startPointObj);
+        }
+        taskObj.setTask_status(TaskStatus.CANCELED.getCode());
+        taskObj.setRemark(GeneralDefinition.TASK_CANCEL);
+        taskObj.setFinished_type(taskFinishedType.getCode());
+        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
+        taskService.updateById(taskObj);
+    }
+}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/ycl/ZPRKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/ycl/ZPRKTask.java
new file mode 100644
index 0000000..f504496
--- /dev/null
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/ycl/ZPRKTask.java
@@ -0,0 +1,203 @@
+package org.nl.wms.sch.task_manage.task.tasks.ycl;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.nl.common.exception.BadRequestException;
+import org.nl.system.service.notice.ISysNoticeService;
+import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService;
+import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup;
+import org.nl.wms.sch.point.service.ISchBasePointService;
+import org.nl.wms.sch.point.service.dao.SchBasePoint;
+import org.nl.wms.sch.task.service.ISchBaseTaskService;
+import org.nl.wms.sch.task.service.ISchBaseTaskconfigService;
+import org.nl.wms.sch.task.service.dao.SchBaseTask;
+import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
+import org.nl.wms.sch.task_manage.AbstractTask;
+import org.nl.wms.sch.task_manage.GeneralDefinition;
+import org.nl.wms.sch.task_manage.enums.*;
+import org.nl.wms.sch.task_manage.task.TaskType;
+import org.nl.wms.sch.task_manage.task.core.TaskStatus;
+import org.nl.wms.util.PointUtils;
+import org.nl.wms.util.TaskUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 组盘区组盘完成入库任务
+ *
+ * @author onepiece
+ */
+@Component(value = "ZPRKTask")
+@TaskType("ZPRKTask")
+public class ZPRKTask extends AbstractTask {
+    private static final String TASK_CONFIG_CODE = "ZPRKTask";
+    @Autowired
+    private ISchBasePointService pointService;
+    @Autowired
+    private ISchBaseTaskService taskService;
+    @Autowired
+    private ISchBaseTaskconfigService taskConfigService;
+    @Autowired
+    private ISysNoticeService noticeService;
+    @Autowired
+    private ISchBaseVehiclematerialgroupService vehiclematerialgroupService;
+
+    @Override
+    public void create() throws BadRequestException {
+
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void createCompletion(SchBaseTask task) {
+        // 配置信息
+        SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
+                .eq(SchBaseTaskconfig::getConfig_code, TASK_CONFIG_CODE));
+        TaskUtils.setUpdateByAcs(task);
+        List<String> nextRegionStr = Arrays.stream(taskConfig.getNext_region_str().split(","))
+                .collect(Collectors.toList());
+        // 找终点
+        SchBasePoint point = findEndPoint(nextRegionStr);
+        if (ObjectUtil.isEmpty(point)) {
+            // 消息通知
+            noticeService.createNotice("原材料库未找到终点空位！", TASK_CONFIG_CODE + task.getPoint_code2(),
+                    NoticeTypeEnum.WARN.getCode());
+            throw new BadRequestException("原材料库未找到终点空位！");
+        }
+        // 设置终点并修改创建成功状态
+        task.setPoint_code2(point.getPoint_code());
+        task.setRemark("");
+        task.setVehicle_qty(point.getVehicle_qty());
+        task.setVehicle_type(point.getCan_vehicle_type());
+        task.setTask_status(TaskStatus.CREATED.getCode());
+        taskService.save(task);
+        // 点位更新
+        point.setIng_task_code(task.getTask_code());
+        PointUtils.setUpdateByAcs(point);
+        pointService.updateById(point);
+    }
+
+    /**
+     * 从原材料库找空位
+     *
+     * @param nextRegionStr
+     * @return
+     */
+    private SchBasePoint findEndPoint(List<String> nextRegionStr) {
+        LambdaQueryWrapper<SchBasePoint> lam = new LambdaQueryWrapper<>();
+        // 默认一直都有载具
+        lam.in(SchBasePoint::getRegion_code, nextRegionStr)
+                // 点位状态是空托
+                .eq(SchBasePoint::getPoint_status, PointStatusEnum.EMPTY_POINT.getCode())
+                // 当前执行的任务为空或者NULL，有数据表示锁住
+                .and(la -> la.isNull(SchBasePoint::getIng_task_code)
+                        .or()
+                        .eq(SchBasePoint::getIng_task_code, ""))
+                .eq(SchBasePoint::getIs_used, true);
+        List<SchBasePoint> schBasePoints = pointService.list(lam);
+        return ObjectUtil.isNotEmpty(schBasePoints) ? schBasePoints.get(0) : null;
+    }
+
+    @Override
+    protected void updateStatus(String task_code, TaskStatus status) {
+        // 校验任务
+        SchBaseTask taskObj = taskService.getByCode(task_code);
+        if (taskObj.getTask_status().equals(TaskStatus.FINISHED.getCode())) {
+            throw new BadRequestException("该任务已完成!");
+        }
+        if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) {
+            throw new BadRequestException("该任务已取消!");
+        }
+        // 根据传来的类型去对任务进行操作
+        if (status.equals(TaskStatus.EXECUTING)) {
+            taskObj.setTask_status(TaskStatus.EXECUTING.getCode());
+            taskObj.setRemark("执行中");
+            TaskUtils.setUpdateByAcs(taskObj);
+            taskService.updateById(taskObj);
+        }
+        if (status.equals(TaskStatus.FINISHED)) {
+            this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
+        }
+        if (status.equals(TaskStatus.CANCELED)) {
+            this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS);
+        }
+    }
+
+    @Override
+    public void forceFinish(String task_code) {
+        SchBaseTask taskObj = taskService.getByCode(task_code);
+        if (ObjectUtil.isEmpty(taskObj)) {
+            throw new BadRequestException("该任务不存在");
+        }
+        this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
+    }
+
+    @Override
+    public void cancel(String task_code) {
+        SchBaseTask taskObj = taskService.getByCode(task_code);
+        if (ObjectUtil.isEmpty(taskObj)) {
+            throw new BadRequestException("该任务不存在");
+        }
+        this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
+        // 获取参数
+        SchBasePoint startPointObj = pointService.getById(taskObj.getPoint_code1());
+        // 起点清空
+        if (ObjectUtil.isNotEmpty(startPointObj)) {
+            PointUtils.setUpdateByType(startPointObj, taskFinishedType);
+            PointUtils.clearPoint(startPointObj);
+            //更新终点的点位信息
+            //更新组盘表载具对应的点位信息
+            SchBasePoint endPointObj = pointService.getById(taskObj.getPoint_code2());
+            if (ObjectUtil.isNotEmpty(endPointObj)) {
+                endPointObj.setPoint_status(PointStatusEnum.FULL_POINT.getCode());
+                endPointObj.setVehicle_type(endPointObj.getCan_vehicle_type());
+                endPointObj.setVehicle_qty(taskObj.getVehicle_qty());
+                endPointObj.setUpdate_time(DateUtil.now());
+                PointUtils.setUpdateByType(endPointObj, taskFinishedType);
+                pointService.updateById(endPointObj);
+
+                SchBaseVehiclematerialgroup vehiclematerialgroup = vehiclematerialgroupService.getById(taskObj.getGroup_id());
+                TaskUtils.setGroupUpdateByType(vehiclematerialgroup, taskFinishedType);
+                vehiclematerialgroup.setTask_code(taskObj.getTask_code());
+                vehiclematerialgroup.setBuss_move_id(taskObj.getTask_code());
+                vehiclematerialgroup.setPoint_code(endPointObj.getPoint_code());
+                vehiclematerialgroup.setPoint_name(endPointObj.getPoint_name());
+                vehiclematerialgroup.setMove_way(taskObj.getPoint_code1() + "->" + taskObj.getPoint_code2());
+                vehiclematerialgroupService.updateById(vehiclematerialgroup);
+            }
+        }
+        // 任务完成
+        taskObj.setTask_status(TaskStatus.FINISHED.getCode());
+        taskObj.setRemark(GeneralDefinition.TASK_FINISH);
+        taskObj.setFinished_type(taskFinishedType.getCode());
+        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
+        taskService.updateById(taskObj);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
+        // 获取参数
+        SchBasePoint startPointObj = pointService.getById(taskObj.getPoint_code1());
+        // 起点解锁
+        if (ObjectUtil.isNotEmpty(startPointObj)) {
+            startPointObj.setIng_task_code("");
+            PointUtils.setUpdateByType(startPointObj, taskFinishedType);
+            pointService.updateById(startPointObj);
+        }
+        taskObj.setTask_status(TaskStatus.CANCELED.getCode());
+        taskObj.setRemark(GeneralDefinition.TASK_CANCEL);
+        taskObj.setFinished_type(taskFinishedType.getCode());
+        TaskUtils.setUpdateByType(taskObj, taskFinishedType);
+        taskService.updateById(taskObj);
+    }
+}
diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml b/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml
index 4d56868..9d79eb9 100644
--- a/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml
+++ b/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml
@@ -69,7 +69,7 @@ https://juejin.cn/post/6844903775631572999
         <appender-ref ref="FILE"/>
     </appender>
     <!--开发环境:打印控制台-->
-    <springProfile name="dev">
+    <springProfile name="dev2">
         <root level="DEBUG">
             <appender-ref ref="asyncLuceneAppender"/>
             <appender-ref ref="asyncFileAppender"/>
diff --git a/lms/nladmin-system/nlsso-server/src/test/java/org/nl/ApplicationTest.java b/lms/nladmin-system/nlsso-server/src/test/java/org/nl/ApplicationTest.java
index 5d6042d..86cfa29 100644
--- a/lms/nladmin-system/nlsso-server/src/test/java/org/nl/ApplicationTest.java
+++ b/lms/nladmin-system/nlsso-server/src/test/java/org/nl/ApplicationTest.java
@@ -1,6 +1,14 @@
 package org.nl;
 
+import org.checkerframework.checker.units.qual.A;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.nl.config.SpringContextHolder;
+import org.nl.wms.sch.point.service.ISchBasePointService;
+import org.nl.wms.sch.point.service.dao.SchBasePoint;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 
 /**
@@ -9,5 +17,27 @@ import org.springframework.boot.test.context.SpringBootTest;
  * @Date: 2023/5/15
  */
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@RunWith(SpringJUnit4ClassRunner.class)
 public class ApplicationTest {
+
+    @Autowired
+    private ISchBasePointService pointService;
+
+    @Test
+    public void test() {
+        for (int i = 1; i < 7; i++) {
+            for (int i1 = 1; i1 < 9; i1++) {
+                for (int i2 = 1; i2 < 4; i2++) {
+                    SchBasePoint point = new SchBasePoint();
+                    point.setPoint_code("0" + i + "-0" + i1 + "-0" + i2);
+                    point.setPoint_name("0" + i + "排-0" + i1 + "列-0" + i2 + "层");
+                    point.setRegion_code("YCL");
+                    point.setPoint_status("1");
+                    point.setPoint_type("1");
+                    point.setIs_has_workder(false);
+                    pointService.create(point);
+                }
+            }
+        }
+    }
 }
diff --git a/lms/nladmin-ui/src/App.vue b/lms/nladmin-ui/src/App.vue
index 5838149..f769963 100644
--- a/lms/nladmin-ui/src/App.vue
+++ b/lms/nladmin-ui/src/App.vue
@@ -24,7 +24,7 @@ export default {
       this.timmer = setTimeout(() => {
         sessionStorage.clear()
         this.logout()
-      }, 1000 * 60 * 151) // 15分钟 https://blog.csdn.net/qq_42345108/article/details/103496456
+      }, 10000 * 60 * 151) // 15分钟 https://blog.csdn.net/qq_42345108/article/details/103496456
     },
     logout() {
       this.$store.dispatch('LogOut').then(() => {
diff --git a/lms/nladmin-ui/src/views/wms/basedata/material/index.vue b/lms/nladmin-ui/src/views/wms/basedata/material/index.vue
index a2cca8f..38435c5 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/material/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/material/index.vue
@@ -87,67 +87,67 @@
           <el-form-item label="物料型号">
             <el-input disabled v-model="form.material_model" style="width: 240px;" />
           </el-form-item>
-          <el-form-item label="A长边">
-            <el-input-number
-              v-model.number="form.a_long_side"
-              :min="0"
-              style="width: 240px;"
-            />
-          </el-form-item>
-          <el-form-item label="B短边">
-            <el-input-number
-              v-model.number="form.b_short_side"
-              :min="0"
-              style="width: 240px;"
-            />
-          </el-form-item>
-          <el-form-item label="H高度">
-            <el-input-number
-              v-model.number="form.h_height"
-              :min="0"
-              style="width: 240px;"
-            />
-          </el-form-item>
-          <el-form-item label="W厚度">
-            <el-input-number
-              v-model.number="form.w_thickness"
-              :min="0"
-              style="width: 240px;"
-            />
-          </el-form-item>
-          <el-form-item label="静置时间(分钟)">
-            <el-input-number
-              v-model.number="form.standing_time"
-              :min="0"
-              style="width: 240px;"
-            />
-          </el-form-item>
-          <el-form-item label="冷却时间(小时)">
-            <el-input-number
-              v-model.number="form.cooling_time"
-              :min="0"
-              style="width: 240px;"
-            />
-          </el-form-item>
-          <el-form-item label="木托盘规格">
-            <el-tooltip class="item" effect="dark" content="例如：950*1000" placement="top">
-              <el-select
-                v-model="form.pack_palletspec"
-                clearable
-                size="mini"
-                placeholder="请选择"
-                class="filter-item"
-                style="width: 240px;"
-              >
-                <el-option
-                  v-for="item in dict.vehicle_type"
-                  :label="item.label"
-                  :value="item.label"
-                  :disabled="item.value === 'LZ' || item.value === 'GTP'"
-                />
-              </el-select>
-            </el-tooltip>
-          </el-form-item>
+<!--          <el-form-item label="A长边">-->
+<!--            <el-input-number-->
+<!--              v-model.number="form.a_long_side"-->
+<!--              :min="0"-->
+<!--              style="width: 240px;"-->
+<!--            />-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="B短边">-->
+<!--            <el-input-number-->
+<!--              v-model.number="form.b_short_side"-->
+<!--              :min="0"-->
+<!--              style="width: 240px;"-->
+<!--            />-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="H高度">-->
+<!--            <el-input-number-->
+<!--              v-model.number="form.h_height"-->
+<!--              :min="0"-->
+<!--              style="width: 240px;"-->
+<!--            />-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="W厚度">-->
+<!--            <el-input-number-->
+<!--              v-model.number="form.w_thickness"-->
+<!--              :min="0"-->
+<!--              style="width: 240px;"-->
+<!--            />-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="静置时间(分钟)">-->
+<!--            <el-input-number-->
+<!--              v-model.number="form.standing_time"-->
+<!--              :min="0"-->
+<!--              style="width: 240px;"-->
+<!--            />-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="冷却时间(小时)">-->
+<!--            <el-input-number-->
+<!--              v-model.number="form.cooling_time"-->
+<!--              :min="0"-->
+<!--              style="width: 240px;"-->
+<!--            />-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="木托盘规格">-->
+<!--            <el-tooltip class="item" effect="dark" content="例如：950*1000" placement="top">-->
+<!--              <el-select-->
+<!--                v-model="form.pack_palletspec"-->
+<!--                clearable-->
+<!--                size="mini"-->
+<!--                placeholder="请选择"-->
+<!--                class="filter-item"-->
+<!--                style="width: 240px;"-->
+<!--              >-->
+<!--                <el-option-->
+<!--                  v-for="item in dict.vehicle_type"-->
+<!--                  :label="item.label"-->
+<!--                  :value="item.label"-->
+<!--                  :disabled="item.value === 'LZ' || item.value === 'GTP'"-->
+<!--                />-->
+<!--              </el-select>-->
+<!--            </el-tooltip>-->
+<!--          </el-form-item>-->
           <el-form-item label="包装方式">
             <el-tooltip class="item" effect="dark" content="例如：3*6*6" placement="top">
               <el-input v-model="form.pack_method" style="width: 240px;" />
@@ -167,12 +167,12 @@
         <el-table-column type="selection" width="55" />
         <el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
         <el-table-column prop="half_material_code" label="半成品编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
-        <el-table-column prop="raw_material_code" label="泥料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
+<!--        <el-table-column prop="raw_material_code" label="泥料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />-->
         <el-table-column prop="material_name" label="物料名称 " :min-width="flexWidth('material_name',crud.data,'物料名称 ')" />
         <el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')" />
         <el-table-column prop="material_model" label="物料型号" :min-width="flexWidth('material_model',crud.data,'物料分类标识')" />
-        <el-table-column prop="standing_time" label="静置时间(分钟)" :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')" />
-        <el-table-column prop="cooling_time" label="冷却时间(小时)" :min-width="flexWidth('cooling_time',crud.data,'静置时间(分钟)')" />
+<!--        <el-table-column prop="standing_time" label="静置时间(分钟)" :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')" />-->
+<!--        <el-table-column prop="cooling_time" label="冷却时间(小时)" :min-width="flexWidth('cooling_time',crud.data,'静置时间(分钟)')" />-->
 <!--        <el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />-->
         <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
         <el-table-column prop="is_used" label="是否启用" :min-width="flexWidth('is_used',crud.data,'是否启用')">
diff --git a/lms/nladmin-ui/src/views/wms/sch/group/index.vue b/lms/nladmin-ui/src/views/wms/sch/group/index.vue
index cbf943c..b376cd3 100644
--- a/lms/nladmin-ui/src/views/wms/sch/group/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/group/index.vue
@@ -10,25 +10,26 @@
           label-width="90px"
           label-suffix=":"
         >
-          <el-form-item label="所属车间">
-            <el-select
-              v-model="query.workshop_code"
-              clearable
-              size="mini"
-              placeholder="所属车间"
-              class="filter-item"
-            >
-              <el-option
-                v-for="item in workShopList"
-                :label="item.workshop_name"
-                :value="item.workshop_code"
-              />
-            </el-select>
-          </el-form-item>
+<!--          <el-form-item label="所属车间">-->
+<!--            <el-select-->
+<!--              v-model="query.workshop_code"-->
+<!--              clearable-->
+<!--              size="mini"-->
+<!--              placeholder="所属车间"-->
+<!--              class="filter-item"-->
+<!--            >-->
+<!--              <el-option-->
+<!--                v-for="item in workShopList"-->
+<!--                :label="item.workshop_name"-->
+<!--                :value="item.workshop_code"-->
+<!--              />-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
           <el-form-item label="所属区域" prop="region_code">
             <el-select
               v-model="query.region_code"
               placeholder="请选择"
+              clearable
               @change="hand"
             >
               <el-option
@@ -47,15 +48,15 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item label="泥料编码">
-            <el-input
-              v-model="query.raw_material_code"
-              clearable
-              size="mini"
-              placeholder="泥料编码"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
+<!--          <el-form-item label="泥料编码">-->
+<!--            <el-input-->
+<!--              v-model="query.raw_material_code"-->
+<!--              clearable-->
+<!--              size="mini"-->
+<!--              placeholder="泥料编码"-->
+<!--              @keyup.enter.native="crud.toQuery"-->
+<!--            />-->
+<!--          </el-form-item>-->
           <el-form-item label="物料编码">
             <el-input
               v-model="query.material_code"
@@ -129,23 +130,23 @@
           <el-form-item label="点位名称">
             <el-input v-model="form.point_name" style="width: 240px;" disabled/>
           </el-form-item>
-          <el-form-item label="是否满托">
-            <el-radio-group v-model="form.is_full" style="width: 240px">
-              <el-radio :label="true">是</el-radio>
-              <el-radio :label="false">否</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="批次">
+<!--          <el-form-item label="是否满托">-->
+<!--            <el-radio-group v-model="form.is_full" style="width: 240px">-->
+<!--              <el-radio :label="true">是</el-radio>-->
+<!--              <el-radio :label="false">否</el-radio>-->
+<!--            </el-radio-group>-->
+<!--          </el-form-item>-->
+          <el-form-item label="配盘批次">
             <el-input v-model="form.pcsn" style="width: 240px;" />
           </el-form-item>
-          <el-form-item label="静置时间(分钟)">
-            <el-input-number
-              v-model.number="form.standing_time"
-              :min="1"
-              :max="999"
-              style="width: 240px;"
-            />
-          </el-form-item>
+<!--          <el-form-item label="静置时间(分钟)">-->
+<!--            <el-input-number-->
+<!--              v-model.number="form.standing_time"-->
+<!--              :min="1"-->
+<!--              :max="999"-->
+<!--              style="width: 240px;"-->
+<!--            />-->
+<!--          </el-form-item>-->
           <el-form-item label="物料数量">
             <el-input-number
               v-model.number="form.material_qty"
@@ -153,16 +154,16 @@
               style="width: 240px;"
             />
           </el-form-item>
-          <el-form-item label="物料重量">
-            <el-input-number
-              v-model.number="form.material_weight"
-              :min="0"
-              style="width: 240px;"
-            />
-          </el-form-item>
-          <el-form-item label="工单编码">
-            <el-input v-model="form.workorder_code" style="width: 240px;" />
-          </el-form-item>
+<!--          <el-form-item label="物料重量">-->
+<!--            <el-input-number-->
+<!--              v-model.number="form.material_weight"-->
+<!--              :min="0"-->
+<!--              style="width: 240px;"-->
+<!--            />-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="工单编码">-->
+<!--            <el-input v-model="form.workorder_code" style="width: 240px;" />-->
+<!--          </el-form-item>-->
           <el-form-item label="物料来源">
             <el-radio-group v-model="choose" size="mini" style="width: 240px;">
               <el-radio-button label="物料" />
@@ -181,12 +182,12 @@
           <el-form-item label="物料规格">
             <el-input v-model="form.material_spec" disabled style="width: 240px;" />
           </el-form-item>
-          <el-form-item label=" 泥料编码">
-            <el-input v-model="form.raw_material_code" disabled style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="组盘次数">
-            <el-input v-model="form.group_number" style="width: 240px;" />
-          </el-form-item>
+<!--          <el-form-item label=" 泥料编码">-->
+<!--            <el-input v-model="form.raw_material_code" disabled style="width: 240px;" />-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="组盘次数">-->
+<!--            <el-input v-model="form.group_number" style="width: 240px;" />-->
+<!--          </el-form-item>-->
           <el-form-item label="任务编码">
             <el-input v-model="form.task_code" style="width: 240px;" />
           </el-form-item>
@@ -197,7 +198,7 @@
             <el-select
               v-model="form.group_status"
               size="mini"
-              placeholder="点位状态"
+              placeholder="组盘状态"
               class="filter-item"
               style="width: 240px;"
               clearable
@@ -209,24 +210,24 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="入窑时间">
-            <el-date-picker
-              v-model="form.into_kiln_time"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              style="width: 240px;"
-              placeholder="选择日期时间">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="出窑时间">
-            <el-date-picker
-              v-model="form.out_kiln_time"
-              type="datetime"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              style="width: 240px;"
-              placeholder="选择日期时间">
-            </el-date-picker>
-          </el-form-item>
+<!--          <el-form-item label="入窑时间">-->
+<!--            <el-date-picker-->
+<!--              v-model="form.into_kiln_time"-->
+<!--              type="datetime"-->
+<!--              value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--              style="width: 240px;"-->
+<!--              placeholder="选择日期时间">-->
+<!--            </el-date-picker>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="出窑时间">-->
+<!--            <el-date-picker-->
+<!--              v-model="form.out_kiln_time"-->
+<!--              type="datetime"-->
+<!--              value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--              style="width: 240px;"-->
+<!--              placeholder="选择日期时间">-->
+<!--            </el-date-picker>-->
+<!--          </el-form-item>-->
           <!--<el-form-item label="是否首个流程任务">
             <el-input v-model="form.is_first_flow_task" style="width: 240px;" />
           </el-form-item>-->
@@ -246,6 +247,22 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="配盘状态">
+            <el-select
+              v-model="form.link_status"
+              size="mini"
+              placeholder="配盘状态"
+              class="filter-item"
+              style="width: 240px;"
+              clearable
+            >
+              <el-option
+                v-for="item in dict.link_status"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item label="载具类型">
             <el-select
               v-model="form.vehicle_type"
@@ -295,27 +312,27 @@
         <el-table-column prop="point_code" label="当前点位编码" :min-width="flexWidth('point_code',crud.data,'当前点位编码')" />
         <el-table-column prop="point_name" label="当前点位名称" :min-width="flexWidth('point_name',crud.data,'当前点位名称')" />
         <el-table-column prop="move_way" label="移动路径" :min-width="flexWidth('move_way',crud.data,'点位名称')" />
-        <el-table-column prop="is_full" label="是否满托" :min-width="flexWidth('is_full',crud.data,'是否满托')">
-          <template slot-scope="scope">
-            {{scope.row.is_full?'是':'否'}}
-          </template>
-        </el-table-column>
+<!--        <el-table-column prop="is_full" label="是否满托" :min-width="flexWidth('is_full',crud.data,'是否满托')">-->
+<!--          <template slot-scope="scope">-->
+<!--            {{scope.row.is_full?'是':'否'}}-->
+<!--          </template>-->
+<!--        </el-table-column>-->
         <el-table-column prop="pcsn" label="批次" :min-width="flexWidth('pcsn',crud.data,'批次')" />
-        <el-table-column prop="workorder_code" label="工单编码" :min-width="flexWidth('workorder_code',crud.data,'工单编码')" />
+<!--        <el-table-column prop="workorder_code" label="工单编码" :min-width="flexWidth('workorder_code',crud.data,'工单编码')" />-->
         <el-table-column prop="instorage_time" label="入库时间" :min-width="flexWidth('instorage_time',crud.data,'入库时间')" />
         <el-table-column prop="group_bind_material_status" label="绑定状态" :min-width="flexWidth('group_bind_material_status',crud.data,'入库时间')">
           <template slot-scope="scope">
             {{ dict.label.group_bind_material_status[scope.row.group_bind_material_status] }}
           </template>
         </el-table-column>
-        <el-table-column prop="standing_time" label="静置时间(分钟)" :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')" />
+<!--        <el-table-column prop="standing_time" label="静置时间(分钟)" :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')" />-->
         <el-table-column prop="material_name" label="物料名称" show-overflow-tooltip :min-width="flexWidth('material_name',crud.data,'物料数量')" />
-        <el-table-column prop="raw_material_code" label="泥料编码" show-overflow-tooltip :min-width="flexWidth('raw_material_code',crud.data,'物料数量')" />
+<!--        <el-table-column prop="raw_material_code" label="泥料编码" show-overflow-tooltip :min-width="flexWidth('raw_material_code',crud.data,'物料数量')" />-->
         <el-table-column prop="material_code" label="物料编码" show-overflow-tooltip :min-width="flexWidth('material_code',crud.data,'物料数量')" />
         <el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料数量')" />
         <el-table-column prop="material_qty" label="物料数量" :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
-        <el-table-column prop="material_weight" label="物料重量" :min-width="flexWidth('material_weight',crud.data,'物料重量')" />
-        <el-table-column prop="group_number" label="组盘次数" :min-width="flexWidth('group_number',crud.data,'组盘次数')" />
+<!--        <el-table-column prop="material_weight" label="物料重量" :min-width="flexWidth('material_weight',crud.data,'物料重量')" />-->
+<!--        <el-table-column prop="group_number" label="组盘次数" :min-width="flexWidth('group_number',crud.data,'组盘次数')" />-->
         <el-table-column prop="task_code" label="任务编码" :min-width="flexWidth('task_code',crud.data,'任务编码')" />
         <!--        <el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')"/>-->
         <el-table-column prop="group_status" label="组盘状态" :min-width="flexWidth('group_status',crud.data,'组盘状态')">
@@ -323,11 +340,16 @@
             {{ dict.label.group_status[scope.row.group_status] }}
           </template>
         </el-table-column>
+        <el-table-column prop="link_status" label="配盘状态" :min-width="flexWidth('link_status',crud.data,'配盘状态')">
+          <template slot-scope="scope">
+            {{ dict.label.link_status[scope.row.link_status] }}
+          </template>
+        </el-table-column>
         <!--        <el-table-column prop="is_first_flow_task" label="是否首个流程任务" :min-width="flexWidth('is_first_flow_task',crud.data,'是否首个流程任务')"/>-->
         <!--        <el-table-column prop="flow_code" label="流程编码" :min-width="flexWidth('flow_code',crud.data,'流程编码')"/>-->
         <!--        <el-table-column prop="flow_num" label="流程顺序" :min-width="flexWidth('flow_num',crud.data,'流程顺序')"/>-->
-        <el-table-column prop="into_kiln_time" label="入窑时间" :min-width="flexWidth('into_kiln_time',crud.data,'上一任务')" />
-        <el-table-column prop="out_kiln_time" label="出窑时间" :min-width="flexWidth('out_kiln_time',crud.data,'上一任务')" />
+<!--        <el-table-column prop="into_kiln_time" label="入窑时间" :min-width="flexWidth('into_kiln_time',crud.data,'上一任务')" />-->
+<!--        <el-table-column prop="out_kiln_time" label="出窑时间" :min-width="flexWidth('out_kiln_time',crud.data,'上一任务')" />-->
 <!--        <el-table-column prop="before_task_code" label="上一任务" :min-width="flexWidth('before_task_code',crud.data,'上一任务')" />-->
 <!--        <el-table-column prop="next_task_code" label="下一任务" :min-width="flexWidth('next_task_code',crud.data,'上一任务')" />-->
         <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
@@ -399,11 +421,12 @@ const defaultForm = {
   remark: null,
   out_kiln_time: null,
   into_kiln_time: null,
-  is_delete: false
+  is_delete: false,
+  link_status: '0'
 }
 export default {
   name: 'VehicleMaterialGroup',
-  dicts: ['group_status', 'group_bind_material_status', 'vehicle_type'],
+  dicts: ['group_status', 'group_bind_material_status', 'vehicle_type', 'link_status'],
   components: { WorkOrderDialog, MaterialDialog, pagination, crudOperation, rrOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
diff --git a/lms/nladmin-ui/src/views/wms/sch/point/PointDialog.vue b/lms/nladmin-ui/src/views/wms/sch/point/PointDialog.vue
index 5168f86..6e74e37 100644
--- a/lms/nladmin-ui/src/views/wms/sch/point/PointDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/point/PointDialog.vue
@@ -107,6 +107,10 @@ export default {
     isSingle: {
       type: Boolean,
       default: false
+    },
+    businessType: {
+      type: String,
+      default: ''
     }
   },
   data() {
@@ -128,7 +132,6 @@ export default {
       this.tableRadio = item
     },
     open() {
-
     },
     handleSelectionChange(val, row) {
       if (val.length > 1 && this.isSingle) {
@@ -148,8 +151,13 @@ export default {
     submit() {
       // 处理单选
       if (this.isSingle && this.tableRadio) {
-        this.$emit('update:dialogShow', false)
-        this.$emit('tableChanged', this.tableRadio)
+        if (this.businessType === 'businessType'){
+          this.$emit('update:dialogShow', false)
+          this.$emit('tableChanged', this.tableRadio)
+        } else if (this.businessType === 'businessType2'){
+          this.$emit('update:dialogShow', false)
+          this.$emit('tableChanged2', this.tableRadio)
+        }
         return
       }
       this.rows = this.$refs.table.selection
@@ -158,15 +166,22 @@ export default {
         return
       }
       this.crud.resetQuery(false)
-      this.$emit('update:dialogShow', false)
-      this.$emit('tableChanged', this.rows)
+      if (this.businessType === 'businessType'){
+        console.log('businessType进来了')
+        this.$emit('update:dialogShow', false)
+        this.$emit('tableChanged', this.rows)
+      } else if (this.businessType === 'businessType2'){
+        console.log('businessType2进来了')
+        this.$emit('update:dialogShow', false)
+        this.$emit('tableChanged2', this.rows)
+      }
     }
   }
 }
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
-  ::v-deep .el-dialog__body {
-    padding-top: 0px;
-  }
+::v-deep .el-dialog__body {
+  padding-top: 0px;
+}
 </style>
 
diff --git a/lms/nladmin-ui/src/views/wms/sch/point/index.vue b/lms/nladmin-ui/src/views/wms/sch/point/index.vue
index 117c726..5aa6f7a 100644
--- a/lms/nladmin-ui/src/views/wms/sch/point/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/point/index.vue
@@ -10,21 +10,21 @@
           label-width="90px"
           label-suffix=":"
         >
-          <el-form-item label="所属车间">
-            <el-select
-              v-model="query.workshop_code"
-              clearable
-              size="mini"
-              placeholder="所属车间"
-              class="filter-item"
-            >
-              <el-option
-                v-for="item in workShopList"
-                :label="item.workshop_name"
-                :value="item.workshop_code"
-              />
-            </el-select>
-          </el-form-item>
+<!--          <el-form-item label="所属车间">-->
+<!--            <el-select-->
+<!--              v-model="query.workshop_code"-->
+<!--              clearable-->
+<!--              size="mini"-->
+<!--              placeholder="所属车间"-->
+<!--              class="filter-item"-->
+<!--            >-->
+<!--              <el-option-->
+<!--                v-for="item in workShopList"-->
+<!--                :label="item.workshop_name"-->
+<!--                :value="item.workshop_code"-->
+<!--              />-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
           <el-form-item label="模糊搜索">
             <el-input
               v-model="query.blurry"
@@ -165,19 +165,19 @@
           <el-form-item v-if="false" label="点位标识" prop="point_id">
             <el-input v-model="form.point_id" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="所属车间">
-            <el-select
-              v-model="form.workshop_code"
-              placeholder="请选择"
-              style="width: 370px;"
-            >
-              <el-option
-                v-for="item in workShopList"
-                :label="item.workshop_name"
-                :value="item.workshop_code"
-              />
-            </el-select>
-          </el-form-item>
+<!--          <el-form-item label="所属车间">-->
+<!--            <el-select-->
+<!--              v-model="form.workshop_code"-->
+<!--              placeholder="请选择"-->
+<!--              style="width: 370px;"-->
+<!--            >-->
+<!--              <el-option-->
+<!--                v-for="item in workShopList"-->
+<!--                :label="item.workshop_name"-->
+<!--                :value="item.workshop_code"-->
+<!--              />-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
           <el-form-item label="所属区域" prop="region_code">
             <el-select
               v-model="form.region_code"
@@ -232,6 +232,9 @@
           <el-form-item label="父类编码" prop="vehicle_code">
             <el-input v-model="form.parent_point_code" clearable style="width: 370px;" @focus="getParentPoint"/>
           </el-form-item>
+          <el-form-item label="下一点位" prop="next_point_code">
+            <el-input v-model="form.next_point_code" clearable style="width: 370px;" @focus="getNextPoint"/>
+          </el-form-item>
           <el-form-item v-if="form.point_status !== '1'" label="载具编码" prop="vehicle_code">
             <el-input v-model="form.vehicle_code" clearable style="width: 370px;" />
           </el-form-item>
@@ -276,15 +279,15 @@
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
-        <el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />
+<!--        <el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />-->
         <el-table-column prop="point_code" label="点位编码" :min-width="flexWidth('point_code',crud.data,'点位编码')" />
         <el-table-column prop="point_name" label="点位名称" :min-width="flexWidth('point_name',crud.data,'点位名称')" />
         <el-table-column prop="region_code" label="区域编码" :min-width="flexWidth('region_code',crud.data,'区域编码')" />
         <el-table-column prop="region_name" label="区域名称" :min-width="flexWidth('region_name',crud.data,'区域名称')" />
         <el-table-column prop="point_type_name" label="点位类型" :min-width="flexWidth('point_type_name',crud.data,'点位类型')"/>
         <el-table-column prop="point_status_name" label="点位状态" :min-width="flexWidth('point_status_name',crud.data,'点位类型')"/>
-<!--        <el-table-column prop="point_type" label="点位类型" :min-width="flexWidth('point_type',crud.data,'点位类型')" />-->
-<!--        <el-table-column prop="point_status" label="点位状态" :min-width="flexWidth('point_status',crud.data,'点位状态')" />-->
+        <!--        <el-table-column prop="point_type" label="点位类型" :min-width="flexWidth('point_type',crud.data,'点位类型')" />-->
+        <!--        <el-table-column prop="point_status" label="点位状态" :min-width="flexWidth('point_status',crud.data,'点位状态')" />-->
         <el-table-column prop="vehicle_type" label="载具类型" :min-width="flexWidth('vehicle_type',crud.data,'载具类型', 30)">
           <template slot-scope="scope">
             {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
@@ -300,9 +303,10 @@
         <el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'载具数量')" />
         <el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'载具数量')" />
         <el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'载具数量')" />
-        <el-table-column prop="material_model" label="物料型号" :min-width="flexWidth('material_model',crud.data,'载具数量')" />
+<!--        <el-table-column prop="material_model" label="物料型号" :min-width="flexWidth('material_model',crud.data,'载具数量')" />-->
         <el-table-column prop="material_qty" label="物料数量" :min-width="flexWidth('material_qty',crud.data,'载具数量')" />
         <el-table-column prop="parent_point_code" label="父点位编码" :min-width="flexWidth('parent_point_code',crud.data,'父点位编码')"/>
+        <el-table-column prop="next_point_code" label="下一点位编码" :min-width="flexWidth('next_point_code',crud.data,'下一点位编码')"/>
         <el-table-column prop="ing_task_code" label="在执行的任务标识" :min-width="flexWidth('ing_task_code',crud.data,'在执行的任务标识')" />
         <el-table-column prop="is_has_workder" label="是否有工单" :min-width="flexWidth('is_has_workder',crud.data,'是否有工单')">
           <template slot-scope="scope">
@@ -347,7 +351,8 @@
       <pagination />
     </div>
     <ViewDialog ref="viewDialog"/>
-    <PointDialog :dialog-show.sync="pointDialog" :is-single="false" @tableChanged="tableChanged"/>
+    <PointDialog :dialog-show.sync="pointDialog" :is-single="false" @tableChanged="tableChanged" :businessType="'businessType'"/>
+    <PointDialog :dialog-show.sync="pointDialog2" :is-single="false" @tableChanged2="tableChanged2" :businessType="'businessType2'"/>
   </div>
 </template>
 
@@ -385,6 +390,7 @@ const defaultForm = {
   in_empty_seq: null,
   out_empty_seq: null,
   parent_point_code: null,
+  next_point_code: null,
   ext_point_code: null,
   ing_task_code: null,
   is_has_workder: 'true',
@@ -442,7 +448,8 @@ export default {
       pointStatusList: [],
       pointStatusDialogList: [],
       pointTypesDialogList: [],
-      pointDialog: false
+      pointDialog: false,
+      pointDialog2: false
     }
   },
   created() {
@@ -524,11 +531,19 @@ export default {
       }
     },
     tableChanged(row) {
+      console.log("tableChanged" + row)
       this.form.parent_point_code = row.map(point => point.point_code).join(',')
     },
+    tableChanged2(row) {
+      console.log("tableChanged2" + row)
+      this.form.next_point_code = row.map(point => point.point_code).join(',')
+    },
     getParentPoint() {
       this.pointDialog = true
     },
+    getNextPoint() {
+      this.pointDialog2 = true
+    },
     handleClear() {
       this.crud.query.region_code = null
       this.crud.query.point_type = null
diff --git a/lms/nladmin-ui/src/views/wms/sch/region/index.vue b/lms/nladmin-ui/src/views/wms/sch/region/index.vue
index 3665f58..7490adf 100644
--- a/lms/nladmin-ui/src/views/wms/sch/region/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/region/index.vue
@@ -10,22 +10,22 @@
           label-width="90px"
           label-suffix=":"
         >
-          <el-form-item label="所属车间">
-            <el-select
-              v-model="query.workshop_code"
-              clearable
-              size="mini"
-              placeholder="所属车间"
-              class="filter-item"
-              @change="hand"
-            >
-              <el-option
-                v-for="item in workShopList"
-                :label="item.workshop_name"
-                :value="item.workshop_code"
-              />
-            </el-select>
-          </el-form-item>
+<!--          <el-form-item label="所属车间">-->
+<!--            <el-select-->
+<!--              v-model="query.workshop_code"-->
+<!--              clearable-->
+<!--              size="mini"-->
+<!--              placeholder="所属车间"-->
+<!--              class="filter-item"-->
+<!--              @change="hand"-->
+<!--            >-->
+<!--              <el-option-->
+<!--                v-for="item in workShopList"-->
+<!--                :label="item.workshop_name"-->
+<!--                :value="item.workshop_code"-->
+<!--              />-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
           <el-form-item label="模糊搜索">
             <el-input
               v-model="query.blurry"
@@ -48,19 +48,19 @@
         :title="crud.status.title"
         width="520px">
         <el-form style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
-          <el-form-item label="所属车间">
-            <el-select
-              v-model="form.workshop_code"
-              placeholder="请选择"
-              style="width: 370px;"
-            >
-              <el-option
-                v-for="item in workShopList"
-                :label="item.workshop_name"
-                :value="item.workshop_code"
-              />
-            </el-select>
-          </el-form-item>
+<!--          <el-form-item label="所属车间">-->
+<!--            <el-select-->
+<!--              v-model="form.workshop_code"-->
+<!--              placeholder="请选择"-->
+<!--              style="width: 370px;"-->
+<!--            >-->
+<!--              <el-option-->
+<!--                v-for="item in workShopList"-->
+<!--                :label="item.workshop_name"-->
+<!--                :value="item.workshop_code"-->
+<!--              />-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
           <el-form-item label="区域编码">
             <el-input v-model="form.region_code" style="width: 370px;" :disabled="crud.status.edit===1"/>
           </el-form-item>
@@ -112,7 +112,7 @@
             {{scope.row.is_has_workder?'是':'否'}}
           </template>
         </el-table-column>
-        <el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />
+<!--        <el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />-->
         <el-table-column prop="order_seq" label="顺序号" :min-width="flexWidth('order_seq',crud.data,'顺序号')" />
         <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
         <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
diff --git a/lms/nladmin-ui/src/views/wms/sch/task/config/index.vue b/lms/nladmin-ui/src/views/wms/sch/task/config/index.vue
index def0bb2..966e29a 100644
--- a/lms/nladmin-ui/src/views/wms/sch/task/config/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/task/config/index.vue
@@ -10,21 +10,21 @@
           label-width="90px"
           label-suffix=":"
         >
-          <el-form-item label="所属车间">
-            <el-select
-              v-model="query.workshop_code"
-              clearable
-              size="mini"
-              placeholder="所属车间"
-              class="filter-item"
-            >
-              <el-option
-                v-for="item in workShopList"
-                :label="item.workshop_name"
-                :value="item.workshop_code"
-              />
-            </el-select>
-          </el-form-item>
+<!--          <el-form-item label="所属车间">-->
+<!--            <el-select-->
+<!--              v-model="query.workshop_code"-->
+<!--              clearable-->
+<!--              size="mini"-->
+<!--              placeholder="所属车间"-->
+<!--              class="filter-item"-->
+<!--            >-->
+<!--              <el-option-->
+<!--                v-for="item in workShopList"-->
+<!--                :label="item.workshop_name"-->
+<!--                :value="item.workshop_code"-->
+<!--              />-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
           <el-form-item label="模糊搜索">
             <el-input
               v-model="query.blurry"
@@ -42,19 +42,19 @@
       <!--表单组件-->
       <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="820px">
         <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="135px" label-suffix=":">
-          <el-form-item label="所属车间">
-            <el-select
-              v-model="form.workshop_code"
-              placeholder="请选择"
-              style="width: 240px;"
-            >
-              <el-option
-                v-for="item in workShopList"
-                :label="item.workshop_name"
-                :value="item.workshop_code"
-              />
-            </el-select>
-          </el-form-item>
+<!--          <el-form-item label="所属车间">-->
+<!--            <el-select-->
+<!--              v-model="form.workshop_code"-->
+<!--              placeholder="请选择"-->
+<!--              style="width: 240px;"-->
+<!--            >-->
+<!--              <el-option-->
+<!--                v-for="item in workShopList"-->
+<!--                :label="item.workshop_name"-->
+<!--                :value="item.workshop_code"-->
+<!--              />-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
           <el-form-item label="配置编码" prop="config_code">
             <el-input v-model="form.config_code" style="width: 240px;" />
           </el-form-item>
@@ -250,9 +250,9 @@
           <el-form-item v-if="false" label="sql配置">
             <el-input v-model="form.sql_param" style="width: 240px;" />
           </el-form-item>
-          <el-form-item v-if="false" label="车间编码">
-            <el-input v-model="form.workshop_code" style="width: 240px;" />
-          </el-form-item>
+<!--          <el-form-item v-if="false" label="车间编码">-->
+<!--            <el-input v-model="form.workshop_code" style="width: 240px;" />-->
+<!--          </el-form-item>-->
           <el-form-item label="备注" prop="remark">
             <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
             <el-input v-model.trim="form.remark" style="width: 480px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
@@ -359,7 +359,7 @@
         </el-table-column>
         <el-table-column prop="unfinish_notify_time" label="未完成通知时间" :min-width="flexWidth('unfinish_notify_time',crud.data,'未完成通知时间')" />
         <el-table-column v-if="false" prop="sql_param" label="sql配置" :min-width="flexWidth('sql_param',crud.data,'sql配置')" />
-        <el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />
+<!--        <el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />-->
         <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
         <!--        <el-table-column prop="is_used" label="是否启用" :min-width="flexWidth('is_used',crud.data,'是否启用')"/>-->
         <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />