diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/controller/BmVehicleInfoController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/controller/BmVehicleInfoController.java
similarity index 92%
rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/controller/BmVehicleInfoController.java
rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/controller/BmVehicleInfoController.java
index b40eb166..51b546f8 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/controller/BmVehicleInfoController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/controller/BmVehicleInfoController.java
@@ -1,12 +1,12 @@
-package org.nl.wms.base_manage.vehicle.vehicleInfo.controller;
+package org.nl.wms.base_manage.vehicle.controller;
 
 
 import com.alibaba.fastjson.JSONObject;
 import org.nl.common.TableDataInfo;
 import org.nl.common.anno.Log;
 import org.nl.common.domain.entity.PageQuery;
-import org.nl.wms.base_manage.vehicle.vehicleInfo.service.IBmVehicleInfoService;
-import org.nl.wms.base_manage.vehicle.vehicleInfo.service.dto.VehicleQuery;
+import org.nl.wms.base_manage.vehicle.service.dto.VehicleQuery;
+import org.nl.wms.base_manage.vehicle.service.IBmVehicleInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/service/IBmVehicleInfoService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/IBmVehicleInfoService.java
similarity index 89%
rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/service/IBmVehicleInfoService.java
rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/IBmVehicleInfoService.java
index f1c7a6f9..19235292 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/service/IBmVehicleInfoService.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/IBmVehicleInfoService.java
@@ -1,12 +1,12 @@
-package org.nl.wms.base_manage.vehicle.vehicleInfo.service;
+package org.nl.wms.base_manage.vehicle.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.common.domain.entity.PageQuery;
-import org.nl.wms.base_manage.vehicle.vehicleInfo.service.dao.BmVehicleInfo;
-import org.nl.wms.base_manage.vehicle.vehicleInfo.service.dto.VehicleQuery;
+import org.nl.wms.base_manage.vehicle.service.dao.BmVehicleInfo;
+import org.nl.wms.base_manage.vehicle.service.dto.VehicleQuery;
 
 import java.util.List;
 import java.util.Map;
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/service/dao/BmVehicleInfo.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dao/BmVehicleInfo.java
similarity index 96%
rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/service/dao/BmVehicleInfo.java
rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dao/BmVehicleInfo.java
index 16d42cdd..c19547c8 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/service/dao/BmVehicleInfo.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dao/BmVehicleInfo.java
@@ -1,4 +1,4 @@
-package org.nl.wms.base_manage.vehicle.vehicleInfo.service.dao;
+package org.nl.wms.base_manage.vehicle.service.dao;
 
 import java.math.BigDecimal;
 
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/service/dao/mapper/BmVehicleInfoMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dao/mapper/BmVehicleInfoMapper.java
similarity index 65%
rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/service/dao/mapper/BmVehicleInfoMapper.java
rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dao/mapper/BmVehicleInfoMapper.java
index 46f3c013..433cd0dc 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/service/dao/mapper/BmVehicleInfoMapper.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dao/mapper/BmVehicleInfoMapper.java
@@ -1,6 +1,6 @@
-package org.nl.wms.base_manage.vehicle.vehicleInfo.service.dao.mapper;
+package org.nl.wms.base_manage.vehicle.service.dao.mapper;
 
-import org.nl.wms.base_manage.vehicle.vehicleInfo.service.dao.BmVehicleInfo;
+import org.nl.wms.base_manage.vehicle.service.dao.BmVehicleInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/service/dao/mapper/xml/BmVehicleInfoMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dao/mapper/xml/BmVehicleInfoMapper.xml
similarity index 73%
rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/service/dao/mapper/xml/BmVehicleInfoMapper.xml
rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dao/mapper/xml/BmVehicleInfoMapper.xml
index 7822961c..140186e0 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/service/dao/mapper/xml/BmVehicleInfoMapper.xml
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dao/mapper/xml/BmVehicleInfoMapper.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.base_manage.vehicle.vehicleInfo.service.dao.mapper.BmVehicleInfoMapper">
+<mapper namespace="org.nl.wms.base_manage.vehicle.service.dao.mapper.BmVehicleInfoMapper">
 
-    <select id="vehileInfo" resultType="org.nl.wms.base_manage.vehicle.vehicleInfo.service.dao.BmVehicleInfo">
+    <select id="vehileInfo" resultType="org.nl.wms.base_manage.vehicle.service.dao.BmVehicleInfo">
         select *
         from md_pb_storagevehicleinfo
         where md_pb_storagevehicleinfo.storagevehicle_code = #{vehicle_code}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/service/dto/VehicleQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dto/VehicleQuery.java
similarity index 82%
rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/service/dto/VehicleQuery.java
rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dto/VehicleQuery.java
index 6678a393..6ca8f797 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/service/dto/VehicleQuery.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dto/VehicleQuery.java
@@ -1,10 +1,10 @@
-package org.nl.wms.base_manage.vehicle.vehicleInfo.service.dto;
+package org.nl.wms.base_manage.vehicle.service.dto;
 
 import lombok.Data;
 import org.nl.common.domain.entity.BaseQuery;
 import org.nl.common.domain.entity.QParam;
 import org.nl.common.enums.QueryTEnum;
-import org.nl.wms.base_manage.vehicle.vehicleInfo.service.dao.BmVehicleInfo;
+import org.nl.wms.base_manage.vehicle.service.dao.BmVehicleInfo;
 
 /*
  * @author ZZQ
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/service/impl/BmVehicleInfoServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/impl/BmVehicleInfoServiceImpl.java
similarity index 93%
rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/service/impl/BmVehicleInfoServiceImpl.java
rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/impl/BmVehicleInfoServiceImpl.java
index 55b76f8f..ce710766 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/service/impl/BmVehicleInfoServiceImpl.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/impl/BmVehicleInfoServiceImpl.java
@@ -1,4 +1,4 @@
-package org.nl.wms.base_manage.vehicle.vehicleInfo.service.impl;
+package org.nl.wms.base_manage.vehicle.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapUtil;
@@ -12,10 +12,10 @@ import org.nl.common.domain.entity.PageQuery;
 import org.nl.common.domain.exception.BadRequestException;
 import org.nl.common.utils.CodeUtil;
 import org.nl.common.utils.SecurityUtils;
-import org.nl.wms.base_manage.vehicle.vehicleInfo.service.IBmVehicleInfoService;
-import org.nl.wms.base_manage.vehicle.vehicleInfo.service.dao.BmVehicleInfo;
-import org.nl.wms.base_manage.vehicle.vehicleInfo.service.dao.mapper.BmVehicleInfoMapper;
-import org.nl.wms.base_manage.vehicle.vehicleInfo.service.dto.VehicleQuery;
+import org.nl.wms.base_manage.vehicle.service.dto.VehicleQuery;
+import org.nl.wms.base_manage.vehicle.service.IBmVehicleInfoService;
+import org.nl.wms.base_manage.vehicle.service.dao.BmVehicleInfo;
+import org.nl.wms.base_manage.vehicle.service.dao.mapper.BmVehicleInfoMapper;
 import org.nl.wms.system_manage.service.dict.ISysDictService;
 import org.nl.wms.system_manage.service.dict.dao.Dict;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/impl/MdPbVehicleMaterServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/impl/MdPbVehicleMaterServiceImpl.java
deleted file mode 100644
index fb1629f7..00000000
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/impl/MdPbVehicleMaterServiceImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.nl.wms.base_manage.vehicle.vehicleMater.service.impl;
-
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.nl.wms.base_manage.vehicle.vehicleMater.service.IMdPbVehicleMaterService;
-import org.nl.wms.base_manage.vehicle.vehicleMater.service.dao.MdPbVehicleMater;
-import org.nl.wms.base_manage.vehicle.vehicleMater.service.dao.mapper.MdPbVehicleMaterMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 载具物料信息表 服务实现类
- * </p>
- *
- * @author generator
- * @since 2024-04-08
- */
-@Service
-public class MdPbVehicleMaterServiceImpl extends ServiceImpl<MdPbVehicleMaterMapper, MdPbVehicleMater> implements IMdPbVehicleMaterService {
-
-    @Autowired
-    private MdPbVehicleMaterMapper mdPbVehicleMaterMapper;
-
-    @Override
-    public Integer getQtySumByMaterial(String material_id) {
-        return mdPbVehicleMaterMapper.getQtySumByMaterial(material_id);
-    }
-}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/applyTask/impl/ApplyFlowTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/applyTask/impl/ApplyFlowTask.java
index 9b93591f..d5a1d1f5 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/applyTask/impl/ApplyFlowTask.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/applyTask/impl/ApplyFlowTask.java
@@ -10,11 +10,8 @@ import org.nl.common.publish.BussEventMulticaster;
 import org.nl.common.utils.MapOf;
 import org.nl.wms.decision_manage.applyTask.AbstractApplyTask;
 import org.nl.wms.flow_manage.monitor.event.FlowStartEvent;
-import org.nl.wms.md_manage.vehicleGroup.service.IMdPbVehicleMaterService;
-import org.nl.wms.md_manage.vehicleGroup.service.dao.MdPbVehicleMater;
-import org.nl.wms.md_manage.vehicleGroup.service.dto.MdPbVehicleMaterVo;
-import org.nl.wms.md_manage.vehicleGroup.service.dto.MdVehicleGruopDtlVo;
-import org.nl.wms.md_manage.vehicleGroup.service.dto.VehicleMaterQuery;
+import org.nl.wms.md_manage.vehicleMater.service.IMdPbVehicleMaterService;
+import org.nl.wms.md_manage.vehicleMater.service.dto.MdPbVehicleMaterVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -45,7 +42,7 @@ public  class ApplyFlowTask extends AbstractApplyTask {
             if (StringUtils.isEmpty(point_code1)){
                 throw new BadRequestException("申请任务失败:请求参数数据异常");
             }
-            MdPbVehicleMater mst = iMdPbVehicleMaterService.getGroupMst(vehicle_code);
+            org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater mst = iMdPbVehicleMaterService.getGroupMst(vehicle_code);
             if (mst == null){
                 throw new BadRequestException("申请任务失败:载具"+vehicle_code+"组盘信息不存在");
             }
@@ -57,7 +54,7 @@ public  class ApplyFlowTask extends AbstractApplyTask {
             JSONObject groupJson = (JSONObject)JSONObject.toJSON(mst);
             BussEventMulticaster.Publish(
                     new FlowStartEvent("md_group",null,new JSONObject(MapOf.of("point_code1",point_code1)))
-                            .build("md_pb_vehicleMater",mst.getId(),mst.getMst_form_type(),mst.getMst_form_id(),(JSONObject) groupJson)
+                            .build("md_pb_vehicleMater",mst.getId(),mst.getSource_form_type(),mst.getSource_form_id(),(JSONObject) groupJson)
                             .build("md_pb_vehicleMater",item)
             );
         }
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/FIFORuleHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/FIFORuleHandler.java
index a2c756f8..706f6bca 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/FIFORuleHandler.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/FIFORuleHandler.java
@@ -4,7 +4,8 @@ import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import org.nl.common.domain.exception.BadRequestException;
 import org.nl.common.utils.MapOf;
-import org.nl.wms.md_manage.vehicleGroup.service.IMdPbVehicleMaterService;
+
+import org.nl.wms.md_manage.vehicleMater.service.IMdPbVehicleMaterService;
 import org.nl.wms.stor_manage.struct.service.IStIvtStructattrService;
 import org.nl.wms.stor_manage.struct.service.dao.StIvtStructattr;
 import org.nl.wms.decision_manage.handler.Decisioner;
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/LimitStorageRuleHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/LimitStorageRuleHandler.java
index 6d2ef4db..69ec9034 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/LimitStorageRuleHandler.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/LimitStorageRuleHandler.java
@@ -3,8 +3,8 @@ package org.nl.wms.decision_manage.handler.impl.base;
 import com.alibaba.fastjson.JSONArray;
 import org.nl.common.domain.exception.BadRequestException;
 import org.nl.wms.stor_manage.struct.service.dao.StIvtStructattr;
-import org.nl.wms.base_manage.vehicle.vehicleInfo.service.IBmVehicleInfoService;
-import org.nl.wms.base_manage.vehicle.vehicleInfo.service.dao.BmVehicleInfo;
+import org.nl.wms.base_manage.vehicle.service.IBmVehicleInfoService;
+import org.nl.wms.base_manage.vehicle.service.dao.BmVehicleInfo;
 import org.nl.wms.decision_manage.handler.Decisioner;
 import org.nl.wms.stor_manage.io.service.in.iostor_dtl.IStIvtIostorinvdtlService;
 import org.nl.wms.stor_manage.io.service.in.iostor_dtl.dao.StIvtIostorinvdtl;
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/StackingTaskHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/StackingTaskHandler.java
index 5622bcf0..c9f220a3 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/StackingTaskHandler.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/StackingTaskHandler.java
@@ -10,10 +10,11 @@ import org.nl.common.enums.StatusEnum;
 import org.nl.common.utils.CodeUtil;
 import org.nl.common.utils.IdUtil;
 import org.nl.common.utils.SecurityUtils;
-import org.nl.wms.md_manage.vehicleGroup.service.IMdPbVehicleMaterService;
+
 import org.nl.wms.dispatch_manage.task.handler.TaskHandler;
 import org.nl.wms.dispatch_manage.task.service.ISchBaseTaskService;
 import org.nl.wms.dispatch_manage.task.service.dao.SchBaseTask;
+import org.nl.wms.md_manage.vehicleMater.service.IMdPbVehicleMaterService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/TaskStatusHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/TaskStatusHandler.java
index 69d34f27..5ac2d4b3 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/TaskStatusHandler.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/TaskStatusHandler.java
@@ -6,12 +6,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.nl.common.enums.StatusEnum;
 import org.nl.common.publish.BussEventMulticaster;
 import org.nl.common.utils.SecurityUtils;
-import org.nl.wms.md_manage.vehicleGroup.service.IMdPbVehicleMaterService;
-import org.nl.wms.md_manage.vehicleGroup.service.dao.MdPbVehicleMater;
+
+
 import org.nl.wms.dispatch_manage.task.handler.StructEvent;
 import org.nl.wms.dispatch_manage.task.handler.TaskHandler;
 import org.nl.wms.dispatch_manage.task.service.ISchBaseTaskService;
 import org.nl.wms.dispatch_manage.task.service.dao.SchBaseTask;
+import org.nl.wms.md_manage.vehicleMater.service.IMdPbVehicleMaterService;
+import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/early_deferral/AlmEarlyDeferralController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/early_deferral/AlmEarlyDeferralController.java
new file mode 100644
index 00000000..802ab500
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/early_deferral/AlmEarlyDeferralController.java
@@ -0,0 +1,116 @@
+package org.nl.wms.early_manage.controller.early_deferral;
+
+
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import org.nl.common.TableDataInfo;
+import org.nl.common.domain.entity.PageQuery;
+import org.nl.common.utils.IdUtil;
+import org.nl.common.utils.SecurityUtils;
+import org.nl.wms.base_manage.material.service.IMdMeMaterialbaseService;
+import org.nl.wms.base_manage.material.service.dao.MdMeMaterialbase;
+import org.nl.wms.early_manage.service.early_deferral.IAlmEarlyDeferralDetailService;
+import org.nl.wms.early_manage.service.early_deferral.IAlmEarlyDeferralService;
+import org.nl.wms.early_manage.service.early_deferral.dao.AlmEarlyDeferral;
+import org.nl.wms.early_manage.service.early_deferral.dao.AlmEarlyDeferralDetail;
+import org.nl.wms.early_manage.service.early_deferral.dto.AlmDeferralQuery;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author generator
+ * @since 2024-05-31
+ */
+@RestController
+@RequestMapping("/api/almEarlyDeferral")
+public class AlmEarlyDeferralController {
+
+    @Autowired
+    private IAlmEarlyDeferralService almEarlyDeferralService;
+    @Autowired
+    private IAlmEarlyDeferralDetailService almEarlyDeferralDetailService;
+    @Autowired
+    private IMdMeMaterialbaseService materialbaseService;
+
+    @GetMapping
+    public ResponseEntity<Object> getAll(AlmDeferralQuery query, PageQuery page) {
+        return new ResponseEntity<>(TableDataInfo.build(almEarlyDeferralService.page(page.build(), query.build())), HttpStatus.OK);
+    }
+
+    @GetMapping("/dtl/{id}")
+    public ResponseEntity<Object> getDtl(@PathVariable String id) {
+        List<AlmEarlyDeferralDetail> list = almEarlyDeferralDetailService.list(new LambdaQueryWrapper<AlmEarlyDeferralDetail>().eq(AlmEarlyDeferralDetail::getDeferral_id, id));
+        JSONArray array = new JSONArray();
+        for (AlmEarlyDeferralDetail detail : list) {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("deferral_id", detail.getDeferral_id());
+            jsonObject.put("material_id", detail.getMaterial_id());
+            MdMeMaterialbase materialbase = materialbaseService.getById(detail.getMaterial_id());
+            jsonObject.put("material_code", materialbase.getMaterial_code());
+            jsonObject.put("material_name", materialbase.getMaterial_name());
+            jsonObject.put("material_spec", materialbase.getMaterial_spec());
+            jsonObject.put("material_model", materialbase.getMaterial_model());
+            array.add(jsonObject);
+        }
+        return new ResponseEntity<>(array, HttpStatus.OK);
+    }
+
+    @PostMapping("/saveDtl")
+    public ResponseEntity<Object> saveDtl(@Validated @RequestBody JSONObject dto) {
+        String id = dto.getString("id");
+        LambdaUpdateWrapper<AlmEarlyDeferralDetail> luw = new LambdaUpdateWrapper<>();
+        luw.eq(AlmEarlyDeferralDetail::getDetail_id, id);
+        almEarlyDeferralDetailService.remove(luw);
+        JSONArray jsonArray = dto.getJSONArray("tableData");
+        for (int i = 0; i < jsonArray.size(); i++) {
+            JSONObject jsonObject = jsonArray.getJSONObject(i);
+            String material_id = jsonObject.getString("material_id");
+            AlmEarlyDeferralDetail almEarlyDeferralDetail = new AlmEarlyDeferralDetail();
+            almEarlyDeferralDetail.setDetail_id(IdUtil.getStringId());
+            almEarlyDeferralDetail.setDeferral_id(id);
+            almEarlyDeferralDetail.setMaterial_id(material_id);
+            almEarlyDeferralDetailService.save(almEarlyDeferralDetail);
+        }
+        return new ResponseEntity<>(HttpStatus.CREATED);
+    }
+
+    @DeleteMapping("/delete")
+    public ResponseEntity<Object> delete(@RequestBody String[] ids) {
+        if (ids.length > 0) {
+            almEarlyDeferralService.removeByIds(Arrays.asList(ids));
+        }
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @PostMapping
+    public ResponseEntity<Object> create(@Validated @RequestBody JSONObject dto) {
+        AlmEarlyDeferral almEarlyDeferral = dto.toJavaObject(AlmEarlyDeferral.class);
+        almEarlyDeferral.setCreate_name(SecurityUtils.getCurrentNickName());
+        almEarlyDeferral.setId(IdUtil.getStringId());
+        almEarlyDeferral.setCreate_time(DateUtil.now());
+        almEarlyDeferralService.save(almEarlyDeferral);
+        return new ResponseEntity<>(HttpStatus.CREATED);
+    }
+
+    @PostMapping("/update")
+    public ResponseEntity<Object> update(@Validated @RequestBody JSONObject dto) {
+        AlmEarlyDeferral almEarlyDeferral = dto.toJavaObject(AlmEarlyDeferral.class);
+        almEarlyDeferral.setCreate_time(DateUtil.now());
+        almEarlyDeferralService.updateById(almEarlyDeferral);
+        return new ResponseEntity<>(HttpStatus.CREATED);
+    }
+}
+
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/early_deferral/AlmEarlyDeferralDetailController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/early_deferral/AlmEarlyDeferralDetailController.java
new file mode 100644
index 00000000..84cf554c
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/early_deferral/AlmEarlyDeferralDetailController.java
@@ -0,0 +1,22 @@
+package org.nl.wms.early_manage.controller.early_deferral;
+
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author generator
+ * @since 2024-05-31
+ */
+@RestController
+@RequestMapping("/api/almEarlyDeferralDetail")
+public class AlmEarlyDeferralDetailController {
+
+}
+
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/notification/EmailNotification.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/notification/EmailNotification.java
new file mode 100644
index 00000000..d2809656
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/notification/EmailNotification.java
@@ -0,0 +1,17 @@
+package org.nl.wms.early_manage.notification;
+
+/**
+ * @Description TODO
+ * @Author Gengby
+ * @Date 2024/5/31
+ */
+public class EmailNotification extends Notification {
+
+    public EmailNotification() {
+    }
+
+    @Override
+    public void send(String message) {
+        System.out.println("发送邮件内容：" + message);
+    }
+}
\ No newline at end of file
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/notification/Notification.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/notification/Notification.java
new file mode 100644
index 00000000..713c6792
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/notification/Notification.java
@@ -0,0 +1,11 @@
+package org.nl.wms.early_manage.notification;
+
+/**
+ * @Description TODO
+ * @Author Gengby
+ * @Date 2024/5/31
+ */
+public abstract class Notification {
+
+    public abstract void send(String message);
+}
\ No newline at end of file
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/notification/NotificationFactory.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/notification/NotificationFactory.java
new file mode 100644
index 00000000..7797ae85
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/notification/NotificationFactory.java
@@ -0,0 +1,19 @@
+package org.nl.wms.early_manage.notification;
+
+/**
+ * @Description TODO
+ * @Author Gengby
+ * @Date 2024/5/31
+ */
+public class NotificationFactory {
+    public static Notification getNotification(String noticeType) {
+        switch (noticeType) {
+            case "1":
+                return new EmailNotification();
+            case "2":
+                return new WeChatNotification();
+            default:
+                throw new IllegalArgumentException("未知的通知类型: " + noticeType);
+        }
+    }
+}
\ No newline at end of file
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/notification/WeChatNotification.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/notification/WeChatNotification.java
new file mode 100644
index 00000000..2c144d87
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/notification/WeChatNotification.java
@@ -0,0 +1,18 @@
+package org.nl.wms.early_manage.notification;
+
+/**
+ * @Description TODO
+ * @Author Gengby
+ * @Date 2024/5/31
+ */
+public class WeChatNotification extends Notification {
+
+
+    public WeChatNotification() {
+    }
+
+    @Override
+    public void send(String message) {
+        System.out.println("发送微信内容：" + message);
+    }
+}
\ No newline at end of file
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/IAlmEarlyDeferralDetailService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/IAlmEarlyDeferralDetailService.java
new file mode 100644
index 00000000..e3d88092
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/IAlmEarlyDeferralDetailService.java
@@ -0,0 +1,16 @@
+package org.nl.wms.early_manage.service.early_deferral;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.wms.early_manage.service.early_deferral.dao.AlmEarlyDeferralDetail;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author generator
+ * @since 2024-05-31
+ */
+public interface IAlmEarlyDeferralDetailService extends IService<AlmEarlyDeferralDetail> {
+
+}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/IAlmEarlyDeferralService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/IAlmEarlyDeferralService.java
new file mode 100644
index 00000000..67b24070
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/IAlmEarlyDeferralService.java
@@ -0,0 +1,17 @@
+package org.nl.wms.early_manage.service.early_deferral;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.wms.early_manage.service.early_deferral.dao.AlmEarlyDeferral;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author generator
+ * @since 2024-05-31
+ */
+public interface IAlmEarlyDeferralService extends IService<AlmEarlyDeferral> {
+
+}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/AlmEarlyDeferral.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/AlmEarlyDeferral.java
new file mode 100644
index 00000000..39821b1d
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/AlmEarlyDeferral.java
@@ -0,0 +1,44 @@
+package org.nl.wms.early_manage.service.early_deferral.dao;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author generator
+ * @since 2024-05-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("alm_early_deferral")
+public class AlmEarlyDeferral implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    private String alm_name;
+
+    private String stor_code;
+
+    private Integer stay_days;
+
+    private String notice_type;
+
+    private String ext_json;
+
+    private Boolean is_used;
+
+    private String remark;
+
+    private String create_name;
+
+    private String create_time;
+}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/AlmEarlyDeferralDetail.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/AlmEarlyDeferralDetail.java
new file mode 100644
index 00000000..0ca2d594
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/AlmEarlyDeferralDetail.java
@@ -0,0 +1,29 @@
+package org.nl.wms.early_manage.service.early_deferral.dao;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author generator
+ * @since 2024-05-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("alm_early_deferral_detail")
+public class AlmEarlyDeferralDetail implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String detail_id;
+
+    private String deferral_id;
+
+    private String material_id;
+}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/mapper/AlmEarlyDeferralDetailMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/mapper/AlmEarlyDeferralDetailMapper.java
new file mode 100644
index 00000000..2e85b254
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/mapper/AlmEarlyDeferralDetailMapper.java
@@ -0,0 +1,16 @@
+package org.nl.wms.early_manage.service.early_deferral.dao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.nl.wms.early_manage.service.early_deferral.dao.AlmEarlyDeferralDetail;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author generator
+ * @since 2024-05-31
+ */
+public interface AlmEarlyDeferralDetailMapper extends BaseMapper<AlmEarlyDeferralDetail> {
+
+}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/mapper/AlmEarlyDeferralMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/mapper/AlmEarlyDeferralMapper.java
new file mode 100644
index 00000000..6421f8e0
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/mapper/AlmEarlyDeferralMapper.java
@@ -0,0 +1,16 @@
+package org.nl.wms.early_manage.service.early_deferral.dao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.nl.wms.early_manage.service.early_deferral.dao.AlmEarlyDeferral;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author generator
+ * @since 2024-05-31
+ */
+public interface AlmEarlyDeferralMapper extends BaseMapper<AlmEarlyDeferral> {
+
+}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/dao/mapper/xml/StIvtIostorinvOutMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/mapper/xml/AlmEarlyDeferralDetailMapper.xml
similarity index 58%
rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/dao/mapper/xml/StIvtIostorinvOutMapper.xml
rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/mapper/xml/AlmEarlyDeferralDetailMapper.xml
index b7534aec..460d4603 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/dao/mapper/xml/StIvtIostorinvOutMapper.xml
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/mapper/xml/AlmEarlyDeferralDetailMapper.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.stor_manage.io.service.out.iostor.dao.mapper.StIvtIostorinvOutMapper">
-
-</mapper>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.nl.wms.early_manage.service.early_deferral.dao.mapper.AlmEarlyDeferralDetailMapper">
+
+</mapper>
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/dao/mapper/xml/MdPbVehicleivtMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/mapper/xml/AlmEarlyDeferralMapper.xml
similarity index 59%
rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/dao/mapper/xml/MdPbVehicleivtMapper.xml
rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/mapper/xml/AlmEarlyDeferralMapper.xml
index 52494a18..cfa49e34 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/dao/mapper/xml/MdPbVehicleivtMapper.xml
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/mapper/xml/AlmEarlyDeferralMapper.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.base_manage.vehicle.vehicleMater.service.dao.mapper.MdPbVehicleMaterMapper">
-
-</mapper>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.nl.wms.early_manage.service.early_deferral.dao.mapper.AlmEarlyDeferralMapper">
+
+</mapper>
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dto/AlmDeferralQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dto/AlmDeferralQuery.java
new file mode 100644
index 00000000..3f58f078
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dto/AlmDeferralQuery.java
@@ -0,0 +1,26 @@
+package org.nl.wms.early_manage.service.early_deferral.dto;
+
+import lombok.Data;
+import org.nl.common.domain.entity.BaseQuery;
+import org.nl.common.domain.entity.QParam;
+import org.nl.common.enums.QueryTEnum;
+import org.nl.wms.early_manage.service.early_deferral.dao.AlmEarlyDeferral;
+
+/*
+ * @author ZZQ
+ * @Date 2023/5/4 19:49
+ */
+@Data
+public class AlmDeferralQuery extends BaseQuery<AlmEarlyDeferral> {
+
+    private String search;
+    private String stor_code;
+
+    @Override
+    public void paramMapping() {
+        super.doP.put("search", QParam.builder().k(new String[]{"alm_name"}).type(QueryTEnum.LK).build());
+        super.doP.put("stor_code", QParam.builder().k(new String[]{"stor_code"}).type(QueryTEnum.EQ).build());
+    }
+
+
+}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/impl/AlmEarlyDeferralDetailServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/impl/AlmEarlyDeferralDetailServiceImpl.java
new file mode 100644
index 00000000..63cca67f
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/impl/AlmEarlyDeferralDetailServiceImpl.java
@@ -0,0 +1,20 @@
+package org.nl.wms.early_manage.service.early_deferral.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.nl.wms.early_manage.service.early_deferral.IAlmEarlyDeferralDetailService;
+import org.nl.wms.early_manage.service.early_deferral.dao.AlmEarlyDeferralDetail;
+import org.nl.wms.early_manage.service.early_deferral.dao.mapper.AlmEarlyDeferralDetailMapper;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author generator
+ * @since 2024-05-31
+ */
+@Service
+public class AlmEarlyDeferralDetailServiceImpl extends ServiceImpl<AlmEarlyDeferralDetailMapper, AlmEarlyDeferralDetail> implements IAlmEarlyDeferralDetailService {
+
+}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/impl/AlmEarlyDeferralServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/impl/AlmEarlyDeferralServiceImpl.java
new file mode 100644
index 00000000..29dafedf
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/impl/AlmEarlyDeferralServiceImpl.java
@@ -0,0 +1,21 @@
+package org.nl.wms.early_manage.service.early_deferral.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.nl.wms.early_manage.service.early_deferral.IAlmEarlyDeferralService;
+import org.nl.wms.early_manage.service.early_deferral.dao.AlmEarlyDeferral;
+import org.nl.wms.early_manage.service.early_deferral.dao.mapper.AlmEarlyDeferralMapper;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author generator
+ * @since 2024-05-31
+ */
+@Service
+public class AlmEarlyDeferralServiceImpl extends ServiceImpl<AlmEarlyDeferralMapper, AlmEarlyDeferral> implements IAlmEarlyDeferralService {
+
+}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/listen/EarlyEventListener.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/listen/EarlyEventListener.java
index 82eb272b..feaaed2c 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/listen/EarlyEventListener.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/listen/EarlyEventListener.java
@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.publish.AbstraceListener;
 import org.nl.common.utils.IdUtil;
-import org.nl.wms.md_manage.vehicleGroup.service.IMdPbVehicleMaterService;
+
 import org.nl.wms.early_manage.service.early_dtl.IAlmEarlyDtlService;
 import org.nl.wms.early_manage.service.early_dtl.dao.AlmEarlyDtl;
 import org.nl.wms.early_manage.service.early_inv.IAlmEarlyInvService;
@@ -13,6 +13,7 @@ import org.nl.wms.early_manage.service.early_inv.dao.AlmEarlyInv;
 import org.nl.wms.early_manage.service.early_msg.IAlmEarlyMsgService;
 import org.nl.wms.early_manage.service.early_msg.dao.AlmEarlyMsg;
 import org.nl.wms.early_manage.service.event.EarlyEvent;
+import org.nl.wms.md_manage.vehicleMater.service.IMdPbVehicleMaterService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/tasks/AutoDeferralNotice.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/tasks/AutoDeferralNotice.java
new file mode 100644
index 00000000..47a519a3
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/tasks/AutoDeferralNotice.java
@@ -0,0 +1,74 @@
+package org.nl.wms.early_manage.tasks;
+
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.nl.common.utils.IdUtil;
+import org.nl.wms.md_manage.vehicleMater.service.IMdPbVehicleMaterService;
+import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater;
+import org.nl.wms.early_manage.notification.NotificationFactory;
+import org.nl.wms.early_manage.service.early_deferral.IAlmEarlyDeferralDetailService;
+import org.nl.wms.early_manage.service.early_deferral.IAlmEarlyDeferralService;
+import org.nl.wms.early_manage.service.early_deferral.dao.AlmEarlyDeferral;
+import org.nl.wms.early_manage.service.early_deferral.dao.AlmEarlyDeferralDetail;
+import org.nl.wms.early_manage.service.early_msg.IAlmEarlyMsgService;
+import org.nl.wms.early_manage.service.early_msg.dao.AlmEarlyMsg;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @Description TODO
+ * @Author Gengby
+ * @Date 2024/5/31
+ */
+@Component
+public class AutoDeferralNotice {
+
+    @Autowired
+    private IAlmEarlyDeferralService almEarlyDeferralService;
+    @Autowired
+    private IAlmEarlyDeferralDetailService almEarlyDeferralDetailService;
+    @Autowired
+    private IMdPbVehicleMaterService mdPbVehicleMaterService;
+    @Autowired
+    private IAlmEarlyMsgService almEarlyMsgService;
+
+    public void run() {
+        LambdaQueryWrapper<AlmEarlyDeferral> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(AlmEarlyDeferral::getIs_used, "1");
+        List<AlmEarlyDeferral> list = almEarlyDeferralService.list(lambdaQueryWrapper);
+        for (AlmEarlyDeferral almEarlyDeferral : list) {
+            LambdaQueryWrapper<AlmEarlyDeferralDetail> lqw = new LambdaQueryWrapper<>();
+            lqw.eq(AlmEarlyDeferralDetail::getDeferral_id, almEarlyDeferral.getId());
+            List<AlmEarlyDeferralDetail> deferralDetails = almEarlyDeferralDetailService.list(lqw);
+            List<String> materialIds = deferralDetails.stream()
+                    .map(detail -> detail.getMaterial_id())
+                    .collect(Collectors.toList());
+            LambdaQueryWrapper<MdPbVehicleMater> mdPbVehicleMaterLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            mdPbVehicleMaterLambdaQueryWrapper.in(MdPbVehicleMater::getMaterial_id, materialIds);
+            List<MdPbVehicleMater> mdPbVehicleMaters = mdPbVehicleMaterService.list(mdPbVehicleMaterLambdaQueryWrapper);
+            List<MdPbVehicleMater> filteredMdPbVehicleMaters = mdPbVehicleMaters.stream()
+                    .filter(mater -> {
+                        long daysBetween = DateUtil.betweenDay(DateUtil.parse(mater.getUpdate_time()), DateUtil.parse(DateUtil.now()), true);
+                        return daysBetween > almEarlyDeferral.getStay_days();
+                    })
+                    .collect(Collectors.toList());
+            for (MdPbVehicleMater filteredMdPbVehicleMater : filteredMdPbVehicleMaters) {
+                AlmEarlyMsg almEarlyMsg = new AlmEarlyMsg();
+                almEarlyMsg.setId(IdUtil.getStringId());
+                almEarlyMsg.setEarly_type("2");
+                almEarlyMsg.setStor_code(almEarlyDeferral.getStor_code());
+                almEarlyMsg.setMaterial_id(filteredMdPbVehicleMater.getMaterial_id());
+                almEarlyMsg.setCreate_time(DateUtil.now());
+                almEarlyMsg.setQty(filteredMdPbVehicleMater.getQty().intValue());
+                almEarlyMsg.setCreate_time(DateUtil.now());
+                almEarlyMsg.setVehicle_code(filteredMdPbVehicleMater.getVehicle_code());
+                almEarlyMsg.setPcsn(filteredMdPbVehicleMater.getPcsn());
+                almEarlyMsgService.save(almEarlyMsg);
+                NotificationFactory.getNotification(almEarlyDeferral.getNotice_type()).send("");
+            }
+        }
+    }
+}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/history/dao/mapper/ActHiExecutionMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/history/dao/mapper/ActHiExecutionMapper.java
index 98f0b621..b31a8555 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/history/dao/mapper/ActHiExecutionMapper.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/history/dao/mapper/ActHiExecutionMapper.java
@@ -3,6 +3,9 @@ package org.nl.wms.flow_manage.flow.service.history.dao.mapper;
 import org.nl.wms.flow_manage.flow.service.history.dao.ActHiExecution;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 流程历史处理表 Mapper 接口
@@ -12,5 +15,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2024-04-28
  */
 public interface ActHiExecutionMapper extends BaseMapper<ActHiExecution> {
-
+    /**
+     * 根据数据表名获取所需字段名称
+     *
+     * @param tableName
+     * @return
+     */
+    List<Map<String, String>> getTableColumnNames(String tableName);
 }
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/history/dao/mapper/xml/ActHiExecutionMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/history/dao/mapper/xml/ActHiExecutionMapper.xml
index d849a1b2..905e18cf 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/history/dao/mapper/xml/ActHiExecutionMapper.xml
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/history/dao/mapper/xml/ActHiExecutionMapper.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.nl.wms.flow_manage.flow.service.history.dao.mapper.ActHiExecutionMapper">
-
+    <select id="getTableColumnNames" resultType="map">
+        SELECT COLUMN_COMMENT AS activity_name,
+               COLUMN_COMMENT AS update_time,
+               COLUMN_COMMENT AS form_id,
+               COLUMN_COMMENT AS form_type,
+               COLUMN_COMMENT AS form_data
+        FROM INFORMATION_SCHEMA.COLUMNS
+        WHERE TABLE_SCHEMA = DATABASE()
+          AND TABLE_NAME = #{tableName}
+    </select>
 </mapper>
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/controller/MdGruopDickController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/controller/MdGruopDickController.java
index f93e4838..d23b0e65 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/controller/MdGruopDickController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/controller/MdGruopDickController.java
@@ -4,19 +4,15 @@ package org.nl.wms.md_manage.group_dick.controller;
 import cn.dev33.satoken.annotation.SaIgnore;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.nl.common.TableDataInfo;
 import org.nl.common.anno.Log;
 import org.nl.common.domain.entity.PageQuery;
 import org.nl.common.utils.RedissonUtils;
 import org.nl.common.utils.SecurityUtils;
-import org.nl.wms.base_manage.vehicle.vehicleMater.service.dao.MdPbVehicleMater;
 import org.nl.wms.md_manage.group_dick.service.IMdGruopDickService;
 import org.nl.wms.md_manage.group_dick.service.dao.MdGruopDick;
 import org.nl.wms.md_manage.group_dick.service.dto.GroupDickQuery;
-import org.nl.wms.md_manage.group_dick.service.dto.MdGruopDtlDto;
 import org.nl.wms.pm_manage.form_data.service.IPmFormDataService;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -25,10 +21,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/IMdGruopDtlService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/IMdGruopDtlService.java
deleted file mode 100644
index 6226ab47..00000000
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/IMdGruopDtlService.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.nl.wms.md_manage.group_dick.service;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.nl.common.domain.entity.PageQuery;
-import org.nl.wms.md_manage.group_dick.service.dao.MdGruopDick;
-import org.nl.wms.md_manage.group_dick.service.dao.MdGruopDtl;
-import org.nl.wms.md_manage.group_dick.service.dto.GroupDickQuery;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * <p>
- * 载具物料组盘表 服务类
- * </p>
- *
- * @author generator
- * @since 2024-04-24
- */
-public interface IMdGruopDtlService extends IService<MdGruopDtl> {
-
-}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/MdGruopDick.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/MdGruopDick.java
index 2727b28b..77a30d09 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/MdGruopDick.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/MdGruopDick.java
@@ -37,11 +37,6 @@ public class MdGruopDick implements Serializable {
      */
     private String code;
 
-    /**
-     * 父载具
-     */
-    private String parent_vehicle_code;
-
     /**
      * 组盘状态
      */
@@ -84,10 +79,6 @@ public class MdGruopDick implements Serializable {
     @TableField(typeHandler = FastjsonTypeHandler.class)
     private JSONObject form_data;
 
-    /**
-     * 流程实例id
-     */
-    private String proc_inst_id;
 
 
 }
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/MdGruopDtl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/MdGruopDtl.java
deleted file mode 100644
index a4b363f3..00000000
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/MdGruopDtl.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.nl.wms.md_manage.group_dick.service.dao;
-
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 载具物料组盘表
- * </p>
- *
- * @author generator
- * @since 2024-04-24
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName(value = "md_group_dtl")
-public class MdGruopDtl implements Serializable {
-
-    /**
-     * 主键
-     */
-    @TableId
-    private String id;
-    /**
-     * 主表id
-     */
-    private String dick_id;
-
-    /**
-     * 载具
-     */
-    private String vehicle_code;
-    /**
-     * 仓位
-     */
-    private String struct_code;
-    /**
-    /**
-     * 仓库
-     */
-    private String stor_code;
-    /**
-     * 载具
-     */
-    private String remark;
-
-    /**
-     * 组盘状态
-     */
-    private String status;
-
-    /**
-     * 源单
-     */
-    private String source_form_type;
-    /**
-     * 源单id
-     */
-    private String source_form_id;
-
-    /**
-     * 修改时间
-     */
-    private String update_time;
-    /**
-     * 修改人
-     */
-    private String update_name;
-
-}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/MdGruopDtlMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/MdGruopDtlMapper.java
deleted file mode 100644
index 369bd58f..00000000
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/MdGruopDtlMapper.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.nl.wms.md_manage.group_dick.service.dao.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import org.nl.wms.md_manage.group_dick.service.dao.MdGruopDick;
-import org.nl.wms.md_manage.group_dick.service.dao.MdGruopDtl;
-import org.nl.wms.md_manage.group_dick.service.dto.GroupDickQuery;
-
-import java.util.List;
-
-/**
- * <p>
- * 载具物料组盘表 Mapper 接口
- * </p>
- *
- * @author generator
- * @since 2024-04-24
- */
-public interface MdGruopDtlMapper extends BaseMapper<MdGruopDtl> {
-
-}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/xml/MdGroupMstMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/xml/MdGroupMstMapper.xml
deleted file mode 100644
index 64d91e36..00000000
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/xml/MdGroupMstMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.md_manage.group_dick.service.dao.mapper.MdGroupMstMapper">
-
-</mapper>
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/MdGruopDtlDto.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/MdGruopDtlDto.java
index 5493b894..818101b0 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/MdGruopDtlDto.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/MdGruopDtlDto.java
@@ -1,13 +1,7 @@
 package org.nl.wms.md_manage.group_dick.service.dto;
 
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.nl.wms.base_manage.vehicle.vehicleMater.service.dao.MdPbVehicleMater;
-import org.nl.wms.md_manage.group_dick.service.dao.MdGruopDtl;
-
-import java.io.Serializable;
+import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater;
 
 /**
  * <p>
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/MdGruopDtlVo.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/MdGruopDtlVo.java
index 6738203d..83da78fb 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/MdGruopDtlVo.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/MdGruopDtlVo.java
@@ -1,7 +1,6 @@
 package org.nl.wms.md_manage.group_dick.service.dto;
 
 import lombok.Data;
-import org.nl.wms.base_manage.vehicle.vehicleMater.service.dao.MdPbVehicleMater;
 
 /**
  * <p>
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java
index f986f250..c79a4932 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java
@@ -9,15 +9,13 @@ import org.apache.commons.lang3.StringUtils;
 import org.nl.common.TableDataInfo;
 import org.nl.common.domain.entity.PageQuery;
 import org.nl.common.enums.StatusEnum;
-import org.nl.common.publish.BussEventMulticaster;
 import org.nl.common.utils.CodeUtil;
 import org.nl.common.utils.IdUtil;
 import org.nl.common.utils.MapOf;
 import org.nl.common.utils.SecurityUtils;
-import org.nl.wms.base_manage.vehicle.vehicleMater.service.IMdPbVehicleMaterService;
-import org.nl.wms.base_manage.vehicle.vehicleMater.service.dao.MdPbVehicleMater;
-import org.nl.wms.flow_manage.monitor.event.FlowStartEvent;
-import org.nl.wms.md_manage.group_dick.service.IMdGruopDtlService;
+import org.nl.wms.md_manage.vehicleMater.service.IMdPbVehicleMaterService;
+import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater;
+
 import org.nl.wms.md_manage.group_dick.service.dao.MdGruopDick;
 import org.nl.wms.md_manage.group_dick.service.dao.MdGruopDtl;
 import org.nl.wms.md_manage.group_dick.service.dao.mapper.MdGruopDickMapper;
@@ -26,7 +24,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.nl.wms.md_manage.group_dick.service.dto.GroupDickQuery;
 import org.nl.wms.md_manage.group_dick.service.dto.MdGruopDtlVo;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -50,11 +47,7 @@ import java.util.function.Consumer;
 @Service
 public class MdGruopDickServiceImpl extends ServiceImpl<MdGruopDickMapper, MdGruopDick> implements IMdGruopDickService {
 
-    @Autowired
-    @Lazy
-    private IMdGruopDickService self;
-    @Autowired
-    private IMdGruopDtlService iMdGruopDtlService;
+
     @Autowired
     private IMdPbVehicleMaterService iMdPbVehicleMaterService;
 
@@ -104,15 +97,7 @@ public class MdGruopDickServiceImpl extends ServiceImpl<MdGruopDickMapper, MdGru
             }
         }
         this.save(mdGroupMst);
-        iMdGruopDtlService.saveBatch(items);
         iMdPbVehicleMaterService.saveBatch(vehicleMaters);
-
-        BussEventMulticaster.Publish(new FlowStartEvent("md_group", (Consumer<String>) proc_inst_id -> {
-                    self.update(new UpdateWrapper<MdGruopDick>()
-                            .set("proc_inst_id",proc_inst_id).eq("id",mdGroupMst.getId())); })
-                .build("md_group_dick",mdGroupMst.getId(),mdGroupMst.getSource_form_type(),mdGroupMst.getSource_form_id(),forms)
-                .build("md_group_dtl",dtlJson)
-                ,false);
     }
 
     @Override
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDtlServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDtlServiceImpl.java
deleted file mode 100644
index f466af58..00000000
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDtlServiceImpl.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.nl.wms.md_manage.group_dick.service.impl;
-
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.nl.wms.md_manage.group_dick.service.IMdGruopDtlService;
-import org.nl.wms.md_manage.group_dick.service.dao.MdGruopDtl;
-import org.nl.wms.md_manage.group_dick.service.dao.mapper.MdGruopDtlMapper;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 载具物料组盘表 服务实现类
- * </p>
- *
- * @author generator
- * @since 2024-04-24
- */
-@Service
-public class MdGruopDtlServiceImpl extends ServiceImpl<MdGruopDtlMapper, MdGruopDtl> implements IMdGruopDtlService {
-
-}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/controller/MdPbVehicleMaterController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/controller/MdPbVehicleMaterController.java
similarity index 85%
rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/controller/MdPbVehicleMaterController.java
rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/controller/MdPbVehicleMaterController.java
index 6c25bac1..b43c4525 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/controller/MdPbVehicleMaterController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/controller/MdPbVehicleMaterController.java
@@ -1,4 +1,4 @@
-package org.nl.wms.base_manage.vehicle.vehicleMater.controller;
+package org.nl.wms.md_manage.vehicleMater.controller;
 
 
 import cn.dev33.satoken.annotation.SaIgnore;
@@ -7,9 +7,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.nl.common.TableDataInfo;
 import org.nl.common.anno.Log;
 import org.nl.common.domain.entity.PageQuery;
-import org.nl.wms.base_manage.vehicle.vehicleMater.service.IMdPbVehicleMaterService;
-import org.nl.wms.base_manage.vehicle.vehicleMater.service.dao.MdPbVehicleMater;
-import org.nl.wms.base_manage.vehicle.vehicleMater.service.dto.VehicleMaterQuery;
+import org.nl.wms.md_manage.vehicleMater.service.IMdPbVehicleMaterService;
+import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater;
+import org.nl.wms.md_manage.vehicleMater.service.dto.VehicleMaterQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/IMdPbVehicleMaterService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/IMdPbVehicleMaterService.java
similarity index 51%
rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/IMdPbVehicleMaterService.java
rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/IMdPbVehicleMaterService.java
index 74cf0cbf..c5259e49 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/IMdPbVehicleMaterService.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/IMdPbVehicleMaterService.java
@@ -1,7 +1,8 @@
-package org.nl.wms.base_manage.vehicle.vehicleMater.service;
+package org.nl.wms.md_manage.vehicleMater.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.nl.wms.base_manage.vehicle.vehicleMater.service.dao.MdPbVehicleMater;
+import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater;
+import org.nl.wms.md_manage.vehicleMater.service.dto.MdPbVehicleMaterVo;
 
 import java.util.List;
 import java.util.Map;
@@ -17,5 +18,9 @@ import java.util.Map;
 public interface IMdPbVehicleMaterService extends IService<MdPbVehicleMater> {
 
     Integer getQtySumByMaterial(String material_id);
+    MdPbVehicleMater getGroupMst(String vehicle_code);
+
+    List<MdPbVehicleMaterVo> getVehicleMaters(String vehicle_code);
+
 
 }
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/dao/MdPbVehicleMater.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dao/MdPbVehicleMater.java
similarity index 87%
rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/dao/MdPbVehicleMater.java
rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dao/MdPbVehicleMater.java
index 9947ca97..b15cf22d 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/dao/MdPbVehicleMater.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dao/MdPbVehicleMater.java
@@ -1,4 +1,4 @@
-package org.nl.wms.base_manage.vehicle.vehicleMater.service.dao;
+package org.nl.wms.md_manage.vehicleMater.service.dao;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -37,11 +37,6 @@ public class MdPbVehicleMater implements Serializable {
      */
     private String material_id;
 
-    /**
-     * 工序id
-     */
-    private String workprocedure_id;
-
     /**
      * 批次
      */
@@ -90,15 +85,23 @@ public class MdPbVehicleMater implements Serializable {
      * 修改时间
      */
     private String update_time;
+    /**
+     * 修改时间
+     */
+    private String update_name;
+    /**
+     * 修改时间
+     */
+    private String create_time;
+    /**
+     * 修改时间
+     */
+    private String create_name;
 
     /**
      * 备注
      */
     private String remark;
 
-    /**
-     * 关联实例id
-     */
-    private String proc_inst_id;
 
 }
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/dao/mapper/MdPbVehicleMaterMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dao/mapper/MdPbVehicleMaterMapper.java
similarity index 59%
rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/dao/mapper/MdPbVehicleMaterMapper.java
rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dao/mapper/MdPbVehicleMaterMapper.java
index 305cc678..7e9414ca 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/dao/mapper/MdPbVehicleMaterMapper.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dao/mapper/MdPbVehicleMaterMapper.java
@@ -1,8 +1,11 @@
-package org.nl.wms.base_manage.vehicle.vehicleMater.service.dao.mapper;
+package org.nl.wms.md_manage.vehicleMater.service.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Select;
-import org.nl.wms.base_manage.vehicle.vehicleMater.service.dao.MdPbVehicleMater;
+import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater;
+import org.nl.wms.md_manage.vehicleMater.service.dto.MdPbVehicleMaterVo;
+
+import java.util.List;
 
 /**
  * <p>
@@ -16,4 +19,6 @@ public interface MdPbVehicleMaterMapper extends BaseMapper<MdPbVehicleMater> {
 
     @Select("SELECT SUM(qty) FROM md_pb_vehicleMater WHERE material_id = #{materialId}")
     Integer getQtySumByMaterial(String material_id);
+
+    List<MdPbVehicleMaterVo> getVehicleMaters(String vehicle_code);
 }
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dao/mapper/xml/MdPbVehicleivtMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dao/mapper/xml/MdPbVehicleivtMapper.xml
new file mode 100644
index 00000000..5ec127af
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dao/mapper/xml/MdPbVehicleivtMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.nl.wms.md_manage.vehicleMater.service.dao.mapper.MdPbVehicleMaterMapper">
+    <resultMap id="VoResultMap" type="org.nl.wms.md_manage.vehicleMater.service.dto.MdPbVehicleMaterVo">
+        <result  property="id" column="id"/>
+        <result  property="parent_vehicle_code" column="parent_vehicle_code"/>
+        <result  property="vehicle_code" column="vehicle_code"/>
+        <result  property="remark" column="remark"/>
+        <result  property="source_form_type" column="source_form_type"/>
+        <result  property="source_form_id" column="source_form_id"/>
+        <result  property="update_name" column="update_name"/>
+        <result  property="update_time" column="update_time"/>
+        <result  property="create_time" column="create_time"/>
+        <result  property="material_code" column="material_code"/>
+        <result  property="material_name" column="material_name"/>
+        <result  property="material_spec" column="material_spec"/>
+        <result  property="form_data" column="form_data" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
+    </resultMap>
+    <select id="getVehicleMaters"
+            resultMap="VoResultMap">
+            select md_pb_vehicleMater.*,material_code,material_name,material_spec
+             from md_pb_vehicleMater left join md_me_materialbase
+                 on md_pb_vehicleMater.material_id = md_me_materialbase.material_id
+            where vehicle_code = #{vehicle_code}
+    </select>
+
+</mapper>
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dto/MdPbVehicleMaterVo.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dto/MdPbVehicleMaterVo.java
new file mode 100644
index 00000000..e77a2ab9
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dto/MdPbVehicleMaterVo.java
@@ -0,0 +1,27 @@
+package org.nl.wms.md_manage.vehicleMater.service.dto;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import lombok.Data;
+import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 载具物料信息表
+ * </p>
+ *
+ * @author generator
+ * @since 2024-04-08
+ */
+@Data
+public class MdPbVehicleMaterVo extends MdPbVehicleMater {
+
+    private String material_code;
+    private String material_name;
+    private String material_spec;
+
+
+}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/dto/VehicleMaterQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dto/VehicleMaterQuery.java
similarity index 76%
rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/dto/VehicleMaterQuery.java
rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dto/VehicleMaterQuery.java
index 76972b8b..fb6ec5a4 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/dto/VehicleMaterQuery.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dto/VehicleMaterQuery.java
@@ -1,11 +1,11 @@
-package org.nl.wms.base_manage.vehicle.vehicleMater.service.dto;
+package org.nl.wms.md_manage.vehicleMater.service.dto;
 
 import lombok.Data;
 import org.nl.common.domain.entity.BaseQuery;
 import org.nl.common.domain.entity.QParam;
 import org.nl.common.enums.QueryTEnum;
-import org.nl.wms.base_manage.vehicle.vehicleInfo.service.dao.BmVehicleInfo;
-import org.nl.wms.base_manage.vehicle.vehicleMater.service.dao.MdPbVehicleMater;
+import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater;
+
 
 /*
  * @author ZZQ
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/impl/MdPbVehicleMaterServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/impl/MdPbVehicleMaterServiceImpl.java
new file mode 100644
index 00000000..4bf65234
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/impl/MdPbVehicleMaterServiceImpl.java
@@ -0,0 +1,41 @@
+package org.nl.wms.md_manage.vehicleMater.service.impl;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.nl.wms.md_manage.vehicleMater.service.IMdPbVehicleMaterService;
+import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater;
+import org.nl.wms.md_manage.vehicleMater.service.dao.mapper.MdPbVehicleMaterMapper;
+import org.nl.wms.md_manage.vehicleMater.service.dto.MdPbVehicleMaterVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 载具物料信息表 服务实现类
+ * </p>
+ *
+ * @author generator
+ * @since 2024-04-08
+ */
+@Service
+public class MdPbVehicleMaterServiceImpl extends ServiceImpl<MdPbVehicleMaterMapper, MdPbVehicleMater> implements IMdPbVehicleMaterService {
+
+
+    @Override
+    public Integer getQtySumByMaterial(String material_id) {
+        return this.baseMapper.getQtySumByMaterial(material_id);
+    }
+
+    @Override
+    public MdPbVehicleMater getGroupMst(String vehicle_code) {
+        return this.getOne(new QueryWrapper<MdPbVehicleMater>().eq("vehicle_code",vehicle_code));
+    }
+
+    @Override
+    public List<MdPbVehicleMaterVo> getVehicleMaters(String vehicle_code) {
+        return this.baseMapper.getVehicleMaters(vehicle_code);
+    }
+}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/IPmFormDataService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/IPmFormDataService.java
index c9717635..cd04ac9a 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/IPmFormDataService.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/IPmFormDataService.java
@@ -1,7 +1,10 @@
 package org.nl.wms.pm_manage.form_data.service;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.Page;
 import org.nl.common.domain.entity.PageQuery;
+import org.nl.wms.config_manage.form_struc.service.dao.BmFormStruc;
 import org.nl.wms.pm_manage.form_data.service.dao.PmFormData;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.wms.pm_manage.form_data.service.dto.FormDataQuery;
@@ -22,7 +25,7 @@ public interface IPmFormDataService extends IService<PmFormData> {
 
     Integer syncFormData(String type,String dataString);
 
-    List<PmFormData> syncAnalyse(SyncFormMapping mapping, String dataString);
+    JSONObject mappingParse(JSONArray mappingJson, BmFormStruc one, JSONObject sourceData);
 
     List<PmFormData> getByType(String from_type);
 
@@ -30,6 +33,7 @@ public interface IPmFormDataService extends IService<PmFormData> {
 
     List<PmFormDataDto> queryTree(FormDataQuery query, PageQuery page);
 
+    List<PmFormData> syncAnalyse(SyncFormMapping formMapping, String sourceString);
 
     Object getSonDtlFormData(String id);
 
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java
index a26fda8b..76bad973 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java
@@ -1,6 +1,7 @@
 package org.nl.wms.pm_manage.form_data.service.impl;
 
 import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -71,7 +72,6 @@ public class PmFormDataServiceImpl extends ServiceImpl<PmFormDataMapper, PmFormD
         this.saveBatch(pmFormDatas);
         return pmFormDatas.size();
     }
-
     @Override
     public List<PmFormData> syncAnalyse(SyncFormMapping formMapping, String sourceString) {
         BmFormStruc one = formStrucService.getOne(new QueryWrapper<BmFormStruc>().eq("form_type", formMapping.getForm_type()));
@@ -151,9 +151,8 @@ public class PmFormDataServiceImpl extends ServiceImpl<PmFormDataMapper, PmFormD
         return this.list(lqw);
     }
 
-
-    private JSONObject mappingParse(JSONArray mapping_json, BmFormStruc formStruc, JSONObject sourceData) {
-
+    @Override
+    public JSONObject mappingParse(JSONArray mapping_json, BmFormStruc formStruc, JSONObject sourceData) {
         if (CollectionUtils.isEmpty(sourceData)) {
             throw new BadRequestException("当前业务数据为空");
         }
@@ -185,7 +184,7 @@ public class PmFormDataServiceImpl extends ServiceImpl<PmFormDataMapper, PmFormD
         return data;
     }
 
-    private JSONObject fieldMapping(Set<String> fields, Map<String, JSONObject> fieldMapping, JSONObject sourceData) {
+    public JSONObject fieldMapping(Set<String> fields, Map<String, JSONObject> fieldMapping, JSONObject sourceData) {
         Map<String, String> SpelMap = new HashMap<>();
         JSONObject data = new JSONObject();
         for (String field : fields) {
@@ -210,7 +209,6 @@ public class PmFormDataServiceImpl extends ServiceImpl<PmFormDataMapper, PmFormD
         }
         return data;
     }
-
     @Override
     public List<PmFormData> getByType(String from_type) {
         Assert.notNull(from_type,"表单类型参数不能为空");
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/in/StIvtIostorinvInController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/in/StIvtIostorinvInController.java
deleted file mode 100644
index 62f7b373..00000000
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/in/StIvtIostorinvInController.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.nl.wms.stor_manage.io.controller.in;
-
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.nl.common.TableDataInfo;
-import org.nl.common.domain.entity.PageQuery;
-import org.nl.wms.dispatch_manage.task.service.ISchBaseTaskService;
-import org.nl.wms.stor_manage.io.service.dto.StorInvQuery;
-import org.nl.wms.stor_manage.io.service.in.iostor.IStIvtIostorinvInService;
-import org.nl.wms.stor_manage.io.service.in.iostor.dao.StIvtIostorinvIn;
-import org.nl.wms.stor_manage.io.service.in.iostor_dtl.IStIvtIostorinvdtlService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 出入库单主表 前端控制器
- * </p>
- *
- * @author generator
- * @since 2024-03-28
- */
-@RestController
-@RequestMapping("api/stIvtIostorinvIn")
-public class StIvtIostorinvInController {
-
-    @Autowired
-    IStIvtIostorinvInService iStIvtIostorinvInService;
-    @Autowired
-    IStIvtIostorinvdtlService iStIvtIostorinvDtlInService;
-    @Autowired
-    ISchBaseTaskService schBaseTaskService;
-
-
-    @GetMapping
-    public ResponseEntity<Object> getAll(StorInvQuery query, PageQuery page) {
-        Page<StIvtIostorinvIn> result = iStIvtIostorinvInService.page(page.build(), query.build());
-        return new ResponseEntity<>(TableDataInfo.build(result), HttpStatus.OK);
-    }
-    @PostMapping
-    public ResponseEntity<Object> save(@RequestBody JSONObject form) {
-        iStIvtIostorinvInService.save(form);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-    @PostMapping("getIosInvDtl")
-    public ResponseEntity<Object> getDtl(@RequestBody String inv_id) {
-        List<Map> mapList = iStIvtIostorinvDtlInService.getByInv(inv_id);
-        return new ResponseEntity<>(mapList,HttpStatus.OK);
-    }
-
-}
-
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/dto/StorInvOutQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/dto/StorInvOutQuery.java
deleted file mode 100644
index e5a7ebb0..00000000
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/dto/StorInvOutQuery.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.nl.wms.stor_manage.io.service.dto;
-
-import lombok.Data;
-import org.nl.common.domain.entity.BaseQuery;
-import org.nl.wms.stor_manage.io.service.in.iostor.dao.StIvtIostorinvIn;
-import org.nl.wms.stor_manage.io.service.out.iostor.dao.StIvtIostorinvOut;
-
-/*
- * @author ZZQ
- * @Date 2023/5/4 19:49
- */
-@Data
-public class StorInvOutQuery extends BaseQuery<StIvtIostorinvOut>{
-    private String form_type;
-    private String code;
-    private String status;
-    private String bill_type;
-    private String product_code;
-
-}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/dto/StorInvQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/dto/StorInvQuery.java
index 3178be04..785e2dfc 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/dto/StorInvQuery.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/dto/StorInvQuery.java
@@ -2,14 +2,14 @@ package org.nl.wms.stor_manage.io.service.dto;
 
 import lombok.Data;
 import org.nl.common.domain.entity.BaseQuery;
-import org.nl.wms.stor_manage.io.service.in.iostor.dao.StIvtIostorinvIn;
+import org.nl.wms.stor_manage.io.service.iostor.dao.StIvtIostorinv;
 
 /*
  * @author ZZQ
  * @Date 2023/5/4 19:49
  */
 @Data
-public class StorInvQuery extends BaseQuery<StIvtIostorinvIn>{
+public class StorInvQuery extends BaseQuery<StIvtIostorinv>{
     private String form_type;
     private String code;
     private String status;
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/in/iostor/IStIvtIostorinvInService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/in/iostor/IStIvtIostorinvInService.java
deleted file mode 100644
index ea25fe9a..00000000
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/in/iostor/IStIvtIostorinvInService.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.nl.wms.stor_manage.io.service.in.iostor;
-
-import com.alibaba.fastjson.JSONObject;
-import org.nl.wms.stor_manage.io.service.in.iostor.dao.StIvtIostorinvIn;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 出入库单主表 服务类
- * </p>
- *
- * @author generator
- * @since 2024-03-28
- */
-public interface IStIvtIostorinvInService extends IService<StIvtIostorinvIn> {
-
-    void save(JSONObject form);
-
-}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/in/iostor/dao/StIvtIostorinvIn.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/in/iostor/dao/StIvtIostorinvIn.java
deleted file mode 100644
index 7db83ac6..00000000
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/in/iostor/dao/StIvtIostorinvIn.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package org.nl.wms.stor_manage.io.service.in.iostor.dao;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-
-import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 出入库单主表
- * </p>
- *
- * @author generator
- * @since 2024-03-28
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName(value = "st_ivt_iostorinv_in",autoResultMap = true)
-public class StIvtIostorinvIn implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 出入单标识
-     */
-    private String id;
-
-    /**
-     * 单据编号
-     */
-    private String code;
-    /**
-     * 业务类型
-     */
-    private String bill_type;
-
-    /**
-     * 生产区域编码
-     */
-    private String product_area;
-
-    /**
-     * 单据状态
-     */
-    private String status;
-    /**
-     * 源单业务日期
-     */
-    private String source_form_date;
-    /**
-     * 源单号
-     */
-    private String source_form_id;
-
-    /**
-     * 源单单据类型
-     */
-    private String source_form_type;
-
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 制单人
-     */
-    private String create_name;
-
-    /**
-     * 制单时间
-     */
-    private String create_time;
-
-    /**
-     * 修改人
-     */
-    private String update_name;
-
-    /**
-     * 修改时间
-     */
-    private String update_time;
-
-    /**
-     * 自定义映射数据
-     */
-    @TableField(typeHandler = FastjsonTypeHandler.class)
-    private JSONObject form_data;
-
-
-}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/in/iostor/dao/mapper/StIvtIostorinvMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/in/iostor/dao/mapper/StIvtIostorinvMapper.java
deleted file mode 100644
index db36106a..00000000
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/in/iostor/dao/mapper/StIvtIostorinvMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.nl.wms.stor_manage.io.service.in.iostor.dao.mapper;
-
-import org.nl.wms.stor_manage.io.service.in.iostor.dao.StIvtIostorinvIn;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 出入库单主表 Mapper 接口
- * </p>
- *
- * @author generator
- * @since 2024-03-28
- */
-public interface StIvtIostorinvMapper extends BaseMapper<StIvtIostorinvIn> {
-
-}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/in/iostor/impl/StIvtIostorinvInServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/in/iostor/impl/StIvtIostorinvInServiceImpl.java
deleted file mode 100644
index db86a1e9..00000000
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/in/iostor/impl/StIvtIostorinvInServiceImpl.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.nl.wms.stor_manage.io.service.in.iostor.impl;
-
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSONObject;
-import org.nl.common.enums.StatusEnum;
-import org.nl.common.utils.CodeUtil;
-import org.nl.common.utils.IdUtil;
-import org.nl.common.utils.SecurityUtils;
-import org.nl.wms.stor_manage.io.service.in.iostor.IStIvtIostorinvInService;
-import org.nl.wms.stor_manage.io.service.in.iostor.dao.StIvtIostorinvIn;
-import org.nl.wms.stor_manage.io.service.in.iostor.dao.mapper.StIvtIostorinvMapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.nl.wms.stor_manage.io.service.in.iostor_dtl.IStIvtIostorinvdtlService;
-import org.nl.wms.stor_manage.io.service.in.iostor_dtl.dao.StIvtIostorinvdtl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 出入库单主表 服务实现类
- * </p>
- *
- * @author generator
- * @since 2024-03-28
- */
-@Service
-public class StIvtIostorinvInServiceImpl extends ServiceImpl<StIvtIostorinvMapper, StIvtIostorinvIn> implements IStIvtIostorinvInService {
-
-    @Autowired
-    private IStIvtIostorinvdtlService iStIvtIostorinvdtlInService;
-
-    @Override
-    @Transactional
-    public void save(JSONObject form) {
-        if (form==null){
-            return;
-        }
-        List<Map> dtls = (List<Map>) form.remove("tableData");
-        StIvtIostorinvIn mst = form.toJavaObject(StIvtIostorinvIn.class);
-        mst.setId(IdUtil.getStringId());
-        mst.setCreate_name(SecurityUtils.getCurrentNickName());
-        mst.setCreate_time(DateUtil.now());
-        mst.setCode(CodeUtil.getNewCode("IO_CODE"));
-        mst.setStatus(StatusEnum.FORM_STATUS.code("生成"));
-        if (dtls!=null && dtls.size()>0){
-            for (int i = 0; i < dtls.size(); i++) {
-                StIvtIostorinvdtl dtl = new JSONObject(dtls.get(i)).toJavaObject(StIvtIostorinvdtl.class);
-                dtl.setId(IdUtil.getStringId());
-                dtl.setInv_id(mst.getId());
-                dtl.setStatus(StatusEnum.FORM_STATUS.code("生成"));
-                iStIvtIostorinvdtlInService.save(dtl);
-            }
-        }
-        this.save(mst);
-    }
-
-}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/in/iostor_dtl/dao/mapper/xml/StIvtIostorinvdtlMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/in/iostor_dtl/dao/mapper/xml/StIvtIostorinvdtlMapper.xml
deleted file mode 100644
index ad3de0f4..00000000
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/in/iostor_dtl/dao/mapper/xml/StIvtIostorinvdtlMapper.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.stor_manage.io.service.in.iostor_dtl.dao.mapper.StIvtIostorinvdtlMapper">
-
-    <insert id="batchInsert">
-        insert into st_ivt_iostorinvdtl() values <foreach collection="dtls" open="(" close=")" item="item">
-    </foreach>
-    </insert>
-    <select id="findByInv2" resultType="java.util.Map">
-        SELECT
-            sum(md_pb_vehicleMater.qty) as qty,
-            st_ivt_iostorinvdtl_in.*,
-            md_me_materialbase.material_code,
-            md_me_materialbase.material_name,
-            md_me_materialbase.material_spec
-        FROM
-            st_ivt_iostorinvdtl_in
-                LEFT JOIN md_me_materialbase ON st_ivt_iostorinvdtl_in.material_id = md_me_materialbase.material_id
-                LEFT JOIN md_pb_vehicleMater ON (st_ivt_iostorinvdtl_in.vehicle_code = md_pb_vehicleMater.vehicle_code
-                                                     and st_ivt_iostorinvdtl_in.material_id = md_pb_vehicleMater.material_id)
-        where inv_id = #{inv_id} GROUP BY st_ivt_iostorinvdtl_in.id
-    </select>
-</mapper>
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/in/iostor_dtl/impl/StIvtIostorinvdtlServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/in/iostor_dtl/impl/StIvtIostorinvdtlServiceImpl.java
deleted file mode 100644
index 01cd6423..00000000
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/in/iostor_dtl/impl/StIvtIostorinvdtlServiceImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.nl.wms.stor_manage.io.service.in.iostor_dtl.impl;
-
-import org.apache.commons.lang3.StringUtils;
-import org.nl.wms.stor_manage.io.service.in.iostor_dtl.IStIvtIostorinvdtlService;
-import org.nl.wms.stor_manage.io.service.in.iostor_dtl.dao.StIvtIostorinvdtl;
-import org.nl.wms.stor_manage.io.service.in.iostor_dtl.dao.mapper.StIvtIostorinvdtlMapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 出入库单明细表 服务实现类
- * </p>
- *
- * @author generator
- * @since 2024-03-29
- */
-@Service
-public class StIvtIostorinvdtlServiceImpl extends ServiceImpl<StIvtIostorinvdtlMapper, StIvtIostorinvdtl> implements IStIvtIostorinvdtlService {
-
-
-    @Override
-    public void batchInsert(List<StIvtIostorinvdtl> dtls) {
-        this.baseMapper.batchInsert(dtls);
-    }
-
-
-    @Override
-    public List<Map> getByInv(String inv_id) {
-        if (StringUtils.isEmpty(inv_id)){
-            return new ArrayList<>();
-        }
-        return this.baseMapper.findByInv(inv_id);
-    }
-}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/IStIvtIostorinvOutService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/IStIvtIostorinvService.java
similarity index 55%
rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/IStIvtIostorinvOutService.java
rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/IStIvtIostorinvService.java
index 6cd305d1..c47fb873 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/IStIvtIostorinvOutService.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/IStIvtIostorinvService.java
@@ -1,9 +1,8 @@
-package org.nl.wms.stor_manage.io.service.out.iostor;
+package org.nl.wms.stor_manage.io.service.iostor;
 
 import com.alibaba.fastjson.JSONObject;
-import org.nl.wms.stor_manage.io.service.in.iostor.dao.StIvtIostorinvIn;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.nl.wms.stor_manage.io.service.out.iostor.dao.StIvtIostorinvOut;
+import org.nl.wms.stor_manage.io.service.iostor.dao.StIvtIostorinv;
 
 /**
  * <p>
@@ -13,7 +12,7 @@ import org.nl.wms.stor_manage.io.service.out.iostor.dao.StIvtIostorinvOut;
  * @author generator
  * @since 2024-03-28
  */
-public interface IStIvtIostorinvOutService extends IService<StIvtIostorinvOut> {
+public interface IStIvtIostorinvService extends IService<StIvtIostorinv> {
 
     void save(JSONObject form);
 
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/dao/StIvtIostorinvOut.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/StIvtIostorinv.java
similarity index 86%
rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/dao/StIvtIostorinvOut.java
rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/StIvtIostorinv.java
index 6b623e36..4d03570c 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/dao/StIvtIostorinvOut.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/StIvtIostorinv.java
@@ -1,4 +1,4 @@
-package org.nl.wms.stor_manage.io.service.out.iostor.dao;
+package org.nl.wms.stor_manage.io.service.iostor.dao;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -19,8 +19,8 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName(value = "st_ivt_iostorinv_out", autoResultMap = true)
-public class StIvtIostorinvOut implements Serializable {
+@TableName(value = "st_ivt_iostorinv", autoResultMap = true)
+public class StIvtIostorinv implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -97,5 +97,10 @@ public class StIvtIostorinvOut implements Serializable {
     @TableField(typeHandler = FastjsonTypeHandler.class)
     private JSONObject form_data;
 
+    /**
+     * 是否为入库单
+     */
+    private Boolean in_storage;
+
 
 }
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/dao/mapper/StIvtIostorinvOutMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/mapper/StIvtIostorinvOutMapper.java
similarity index 65%
rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/dao/mapper/StIvtIostorinvOutMapper.java
rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/mapper/StIvtIostorinvOutMapper.java
index fd6b5f4f..5bea77c8 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/dao/mapper/StIvtIostorinvOutMapper.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/mapper/StIvtIostorinvOutMapper.java
@@ -1,8 +1,8 @@
-package org.nl.wms.stor_manage.io.service.out.iostor.dao.mapper;
+package org.nl.wms.stor_manage.io.service.iostor.dao.mapper;
 
 import org.nl.wms.stor_manage.io.service.in.iostor.dao.StIvtIostorinvIn;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.nl.wms.stor_manage.io.service.out.iostor.dao.StIvtIostorinvOut;
+import org.nl.wms.stor_manage.io.service.iostor.dao.StIvtIostorinv;
 
 /**
  * <p>
@@ -12,6 +12,6 @@ import org.nl.wms.stor_manage.io.service.out.iostor.dao.StIvtIostorinvOut;
  * @author generator
  * @since 2024-03-28
  */
-public interface StIvtIostorinvOutMapper extends BaseMapper<StIvtIostorinvOut> {
+public interface StIvtIostorinvOutMapper extends BaseMapper<StIvtIostorinv> {
 
 }
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/in/iostor/dao/mapper/xml/StIvtIostorinvMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/mapper/xml/StIvtIostorinvOutMapper.xml
similarity index 61%
rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/in/iostor/dao/mapper/xml/StIvtIostorinvMapper.xml
rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/mapper/xml/StIvtIostorinvOutMapper.xml
index 1df581b6..9fd0f76c 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/in/iostor/dao/mapper/xml/StIvtIostorinvMapper.xml
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/mapper/xml/StIvtIostorinvOutMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.stor_manage.io.service.in.iostor.dao.mapper.StIvtIostorinvMapper">
+<mapper namespace="org.nl.wms.stor_manage.io.service.iostor.dao.mapper.StIvtIostorinvOutMapper">
 
 </mapper>
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/impl/StIvtIostorinvOutServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/impl/StIvtIostorinvServiceImpl.java
similarity index 77%
rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/impl/StIvtIostorinvOutServiceImpl.java
rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/impl/StIvtIostorinvServiceImpl.java
index 7af4786a..5b211b53 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/impl/StIvtIostorinvOutServiceImpl.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/impl/StIvtIostorinvServiceImpl.java
@@ -1,4 +1,4 @@
-package org.nl.wms.stor_manage.io.service.out.iostor.impl;
+package org.nl.wms.stor_manage.io.service.iostor.impl;
 
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -14,11 +14,11 @@ import org.nl.common.utils.MapOf;
 import org.nl.common.utils.SecurityUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.nl.wms.flow_manage.monitor.event.FlowStartEvent;
-import org.nl.wms.stor_manage.io.service.out.iostor.IStIvtIostorinvOutService;
-import org.nl.wms.stor_manage.io.service.out.iostor.dao.StIvtIostorinvOut;
-import org.nl.wms.stor_manage.io.service.out.iostor.dao.mapper.StIvtIostorinvOutMapper;
-import org.nl.wms.stor_manage.io.service.out.iostor_dtl.IStIvtIostorinvdtlOutService;
-import org.nl.wms.stor_manage.io.service.out.iostor_dtl.dao.StIvtIostorinvdtlOut;
+import org.nl.wms.stor_manage.io.service.iostor.IStIvtIostorinvService;
+import org.nl.wms.stor_manage.io.service.iostor.dao.StIvtIostorinv;
+import org.nl.wms.stor_manage.io.service.iostor.dao.mapper.StIvtIostorinvOutMapper;
+import org.nl.wms.stor_manage.io.service.iostor_dtl.IStIvtIostorinvdtlService;
+import org.nl.wms.stor_manage.io.service.iostor_dtl.dao.StIvtIostorinvdtl;
 import org.nl.wms.stor_manage.struct.service.IStIvtStructattrService;
 import org.nl.wms.stor_manage.struct.service.dao.StIvtStructattr;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +30,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 /**
@@ -42,10 +41,10 @@ import java.util.stream.Collectors;
  * @since 2024-03-28
  */
 @Service
-public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutMapper, StIvtIostorinvOut> implements IStIvtIostorinvOutService {
+public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvOutMapper, StIvtIostorinv> implements IStIvtIostorinvService {
 
     @Autowired
-    private IStIvtIostorinvdtlOutService iStIvtIostorinvDtlOutService;
+    private IStIvtIostorinvdtlService iStIvtIostorinvDtlOutService;
     @Autowired
     private IStIvtStructattrService iStIvtStructattrService;
 
@@ -56,7 +55,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
             return;
         }
         List<Map> dtls = (List<Map>) form.remove("item");
-        StIvtIostorinvOut mst = form.toJavaObject(StIvtIostorinvOut.class);
+        StIvtIostorinv mst = form.toJavaObject(StIvtIostorinv.class);
         mst.setId(IdUtil.getStringId());
         mst.setCreate_name(SecurityUtils.getCurrentNickName());
         mst.setCreate_time(DateUtil.now());
@@ -64,7 +63,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
         mst.setStatus(StatusEnum.FORM_STATUS.code("生成"));
         if (dtls!=null && dtls.size()>0){
             for (int i = 0; i < dtls.size(); i++) {
-                StIvtIostorinvdtlOut dtl = new JSONObject(dtls.get(i)).toJavaObject(StIvtIostorinvdtlOut.class);
+                StIvtIostorinvdtl dtl = new JSONObject(dtls.get(i)).toJavaObject(StIvtIostorinvdtl.class);
                 dtl.setId(IdUtil.getStringId());
                 dtl.setInv_id(mst.getId());
                 dtl.setStatus(StatusEnum.FORM_STATUS.code("生成"));
@@ -82,13 +81,13 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
         if (CollectionUtils.isEmpty(desicion)){
             throw new BadRequestException("分配失败,当前出库分配无可用货位");
         }
-        iStIvtIostorinvDtlOutService.update(new UpdateWrapper<StIvtIostorinvdtlOut>()
+        iStIvtIostorinvDtlOutService.update(new UpdateWrapper<StIvtIostorinvdtl>()
                 .set("vehicle_code",desicion.stream().map(StIvtStructattr::getVehicle_code).collect(Collectors.joining(",")))
                 .eq("id",form.getString("id")));
-        int count = iStIvtIostorinvDtlOutService.count(new QueryWrapper<StIvtIostorinvdtlOut>()
+        int count = iStIvtIostorinvDtlOutService.count(new QueryWrapper<StIvtIostorinvdtl>()
                 .eq("inv_id", form.getString("inv_id")).isNull("vehicle_code"));
         if (count == 0){
-            this.update(new UpdateWrapper<StIvtIostorinvOut>()
+            this.update(new UpdateWrapper<StIvtIostorinv>()
                     .set("status",StatusEnum.FORM_STATUS.code("已分配"))
                     .eq("id",form.getString("inv_id")));
         }
@@ -105,11 +104,11 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
             iStIvtStructattrService.update(new UpdateWrapper<StIvtStructattr>()
                     .set("lock_type", StatusEnum.LOCK.code("无"))
                     .in("vehicle_code", Arrays.asList(split)));
-            iStIvtIostorinvDtlOutService.update(new UpdateWrapper<StIvtIostorinvdtlOut>()
+            iStIvtIostorinvDtlOutService.update(new UpdateWrapper<StIvtIostorinvdtl>()
                     .set("vehicle_code",null)
                     .eq("id",form.getString("id")));
 
-            this.update(new UpdateWrapper<StIvtIostorinvOut>()
+            this.update(new UpdateWrapper<StIvtIostorinv>()
                     .set("status",StatusEnum.FORM_STATUS.code("生成"))
                     .eq("id",form.getString("inv_id")));
         }
@@ -120,12 +119,12 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
     @Override
     public void taskOpen(JSONObject form) {
 
-        StIvtIostorinvOut iostorinv = form.toJavaObject(StIvtIostorinvOut.class);
+        StIvtIostorinv iostorinv = form.toJavaObject(StIvtIostorinv.class);
         //查询明细
-        List<StIvtIostorinvdtlOut> dtls = iStIvtIostorinvDtlOutService.list(new QueryWrapper<StIvtIostorinvdtlOut>().eq("inv_id", iostorinv.getId()));
+        List<StIvtIostorinvdtl> dtls = iStIvtIostorinvDtlOutService.list(new QueryWrapper<StIvtIostorinvdtl>().eq("inv_id", iostorinv.getId()));
         List<Map> dtlJson = new ArrayList<>();
         if (!CollectionUtils.isEmpty(dtls)){
-            for (StIvtIostorinvdtlOut dtl : dtls) {
+            for (StIvtIostorinvdtl dtl : dtls) {
                 dtlJson.add(MapOf.of("form_id",dtl.getId()
                         ,"t",JSONObject.toJSON(dtl)
                         ,"source_form_type",dtl.getSource_form_type()
@@ -137,7 +136,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
                         .build("st_ivt_iostorinvdtl_out",dtlJson)
                 ,true);
 
-        this.update(new UpdateWrapper<StIvtIostorinvOut>()
+        this.update(new UpdateWrapper<StIvtIostorinv>()
                 .set("status",StatusEnum.FORM_STATUS.code("执行中"))
                 .set("update_time",DateUtil.now())
                 .set("update_name",SecurityUtils.getCurrentNickName())
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/in/iostor_dtl/IStIvtIostorinvdtlService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dtl/IStIvtIostorinvdtlService.java
similarity index 74%
rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/in/iostor_dtl/IStIvtIostorinvdtlService.java
rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dtl/IStIvtIostorinvdtlService.java
index b4401294..dc3e06c5 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/in/iostor_dtl/IStIvtIostorinvdtlService.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dtl/IStIvtIostorinvdtlService.java
@@ -1,7 +1,7 @@
-package org.nl.wms.stor_manage.io.service.in.iostor_dtl;
+package org.nl.wms.stor_manage.io.service.iostor_dtl;
 
-import org.nl.wms.stor_manage.io.service.in.iostor_dtl.dao.StIvtIostorinvdtl;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.nl.wms.stor_manage.io.service.iostor_dtl.dao.StIvtIostorinvdtl;
 
 import java.util.List;
 import java.util.Map;
@@ -18,5 +18,7 @@ public interface IStIvtIostorinvdtlService extends IService<StIvtIostorinvdtl> {
 
     void batchInsert(List<StIvtIostorinvdtl> dtls);
 
+
     List<Map> getByInv(String inv_id);
+
 }
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/in/iostor_dtl/dao/StIvtIostorinvdtl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dtl/dao/StIvtIostorinvdtl.java
similarity index 79%
rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/in/iostor_dtl/dao/StIvtIostorinvdtl.java
rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dtl/dao/StIvtIostorinvdtl.java
index 89497488..625f2256 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/in/iostor_dtl/dao/StIvtIostorinvdtl.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dtl/dao/StIvtIostorinvdtl.java
@@ -1,4 +1,4 @@
-package org.nl.wms.stor_manage.io.service.in.iostor_dtl.dao;
+package org.nl.wms.stor_manage.io.service.iostor_dtl.dao;
 
 import java.math.BigDecimal;
 
@@ -21,9 +21,8 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName(value = "st_ivt_iostorinvdtl_in",autoResultMap = true)
+@TableName(value = "st_ivt_iostorinvdtl", autoResultMap = true)
 public class StIvtIostorinvdtl implements Serializable {
-
     private static final long serialVersionUID = 1L;
 
     /**
@@ -36,11 +35,6 @@ public class StIvtIostorinvdtl implements Serializable {
      */
     private String inv_id;
 
-    /**
-     * 出入单标识
-     */
-    private Boolean in_storage = Boolean.TRUE;
-
     /**
      * 源单号
      */
@@ -76,16 +70,6 @@ public class StIvtIostorinvdtl implements Serializable {
      */
     private BigDecimal qty;
 
-
-    /**
-     * 未分配数量(计划数量-载具物料数量)
-     */
-    private BigDecimal unassign_qty;
-
-    /**
-     * 分配数量
-     */
-    private BigDecimal assign_qty;
     /**
      * 分配的载具
      */
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/in/iostor_dtl/dao/mapper/StIvtIostorinvdtlMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dtl/dao/mapper/StIvtIostorinvdtlMapper.java
similarity index 70%
rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/in/iostor_dtl/dao/mapper/StIvtIostorinvdtlMapper.java
rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dtl/dao/mapper/StIvtIostorinvdtlMapper.java
index 7619e4c3..baa5d864 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/in/iostor_dtl/dao/mapper/StIvtIostorinvdtlMapper.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dtl/dao/mapper/StIvtIostorinvdtlMapper.java
@@ -1,11 +1,11 @@
-package org.nl.wms.stor_manage.io.service.in.iostor_dtl.dao.mapper;
+package org.nl.wms.stor_manage.io.service.iostor_dtl.dao.mapper;
 
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import org.apache.ibatis.annotations.Result;
 import org.apache.ibatis.annotations.Results;
 import org.apache.ibatis.annotations.Select;
-import org.nl.wms.stor_manage.io.service.in.iostor_dtl.dao.StIvtIostorinvdtl;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.nl.wms.stor_manage.io.service.iostor_dtl.dao.StIvtIostorinvdtl;
 
 import java.util.List;
 import java.util.Map;
@@ -24,18 +24,18 @@ public interface StIvtIostorinvdtlMapper extends BaseMapper<StIvtIostorinvdtl> {
 
     @Select("SELECT\n" +
             "            sum(md_pb_vehicleMater.qty) as qty,\n" +
-            "            st_ivt_iostorinvdtl_in.*,\n" +
+            "            st_ivt_iostorinvdtl.*,\n" +
             "            md_me_materialbase.material_code,\n" +
             "            md_me_materialbase.material_name,\n" +
             "            md_me_materialbase.material_spec\n" +
             "        FROM\n" +
-            "            st_ivt_iostorinvdtl_in\n" +
-            "                LEFT JOIN md_me_materialbase ON st_ivt_iostorinvdtl_in.material_id = md_me_materialbase.material_id\n" +
-            "                LEFT JOIN md_pb_vehicleMater ON (st_ivt_iostorinvdtl_in.vehicle_code = md_pb_vehicleMater.vehicle_code\n" +
-            "                                                     and st_ivt_iostorinvdtl_in.material_id = md_pb_vehicleMater.material_id)\n" +
-            "        where inv_id = #{inv_id} GROUP BY st_ivt_iostorinvdtl_in.id")
+            "            st_ivt_iostorinvdtl\n" +
+            "                LEFT JOIN md_me_materialbase ON st_ivt_iostorinvdtl.material_id = md_me_materialbase.material_id\n" +
+            "                LEFT JOIN md_pb_vehicleMater ON (st_ivt_iostorinvdtl.vehicle_code = md_pb_vehicleMater.vehicle_code\n" +
+            "                                                     and st_ivt_iostorinvdtl.material_id = md_pb_vehicleMater.material_id)\n" +
+            "        where inv_id = #{inv_id} GROUP BY st_ivt_iostorinvdtl.id")
     @Results({@Result(property = "form_data",column = "form_data",typeHandler = FastjsonTypeHandler.class)})
     List<Map> findByInv(String inv_id);
-    List<Map> findByInv2(String inv_id);
+
 
 }
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dtl/dao/mapper/xml/StIvtIostorinvdtlMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dtl/dao/mapper/xml/StIvtIostorinvdtlMapper.xml
new file mode 100644
index 00000000..272f1d42
--- /dev/null
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dtl/dao/mapper/xml/StIvtIostorinvdtlMapper.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.nl.wms.stor_manage.io.service.iostor_dtl.dao.mapper.StIvtIostorinvdtlMapper">
+
+    <insert id="batchInsert">
+        insert into st_ivt_iostorinvdtl() values <foreach collection="dtls" open="(" close=")" item="item">
+    </foreach>
+    </insert>
+</mapper>
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/impl/StIvtIostorinvdtlOutServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dtl/impl/StIvtIostorinvdtlServiceImpl.java
similarity index 77%
rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/impl/StIvtIostorinvdtlOutServiceImpl.java
rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dtl/impl/StIvtIostorinvdtlServiceImpl.java
index 6958e03e..e94570f1 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/impl/StIvtIostorinvdtlOutServiceImpl.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dtl/impl/StIvtIostorinvdtlServiceImpl.java
@@ -1,11 +1,11 @@
-package org.nl.wms.stor_manage.io.service.out.iostor_dtl.impl;
+package org.nl.wms.stor_manage.io.service.iostor_dtl.impl;
 
 import org.apache.commons.lang3.StringUtils;
 import org.nl.common.utils.MapOf;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.nl.wms.stor_manage.io.service.out.iostor_dtl.IStIvtIostorinvdtlOutService;
-import org.nl.wms.stor_manage.io.service.out.iostor_dtl.dao.StIvtIostorinvdtlOut;
-import org.nl.wms.stor_manage.io.service.out.iostor_dtl.dao.mapper.StIvtIostorinvdtlOutMapper;
+import org.nl.wms.stor_manage.io.service.iostor_dtl.IStIvtIostorinvdtlService;
+import org.nl.wms.stor_manage.io.service.iostor_dtl.dao.StIvtIostorinvdtl;
+import org.nl.wms.stor_manage.io.service.iostor_dtl.dao.mapper.StIvtIostorinvdtlMapper;
 import org.nl.wms.stor_manage.struct.service.IStIvtStructattrService;
 import org.nl.wms.stor_manage.struct.service.dto.StructattrVechielDto;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,13 +26,13 @@ import java.util.stream.Collectors;
  * @since 2024-03-29
  */
 @Service
-public class StIvtIostorinvdtlOutServiceImpl extends ServiceImpl<StIvtIostorinvdtlOutMapper, StIvtIostorinvdtlOut> implements IStIvtIostorinvdtlOutService {
+public class StIvtIostorinvdtlServiceImpl extends ServiceImpl<StIvtIostorinvdtlMapper, StIvtIostorinvdtl> implements IStIvtIostorinvdtlService {
 
     @Autowired
     private IStIvtStructattrService iStIvtStructattrService;
 
     @Override
-    public void batchInsert(List<StIvtIostorinvdtlOut> dtls) {
+    public void batchInsert(List<StIvtIostorinvdtl> dtls) {
         this.baseMapper.batchInsert(dtls);
     }
 
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/IStIvtIostorinvdtlOutService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/IStIvtIostorinvdtlOutService.java
deleted file mode 100644
index 43d5908e..00000000
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/IStIvtIostorinvdtlOutService.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.nl.wms.stor_manage.io.service.out.iostor_dtl;
-
-import com.alibaba.fastjson.JSONObject;
-import org.nl.wms.stor_manage.io.service.in.iostor_dtl.dao.StIvtIostorinvdtl;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.nl.wms.stor_manage.io.service.out.iostor_dtl.dao.StIvtIostorinvdtlOut;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 出入库单明细表 服务类
- * </p>
- *
- * @author generator
- * @since 2024-03-29
- */
-public interface IStIvtIostorinvdtlOutService extends IService<StIvtIostorinvdtlOut> {
-
-    void batchInsert(List<StIvtIostorinvdtlOut> dtls);
-
-
-    List<Map> getByInv(String inv_id);
-
-}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/dao/StIvtIostorinvdtlOut.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/dao/StIvtIostorinvdtlOut.java
deleted file mode 100644
index 762fbf7c..00000000
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/dao/StIvtIostorinvdtlOut.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package org.nl.wms.stor_manage.io.service.out.iostor_dtl.dao;
-
-import java.math.BigDecimal;
-
-import cn.hutool.json.JSONObject;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-
-import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 出入库单明细表
- * </p>
- *
- * @author generator
- * @since 2024-03-29
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName(value = "st_ivt_iostorinvdtl_out", autoResultMap = true)
-public class StIvtIostorinvdtlOut implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 出入单明细标识
-     */
-    private String id;
-
-    /**
-     * 出入单标识
-     */
-    private String inv_id;
-
-    /**
-     * 源单号
-     */
-    private String source_form_id;
-
-    /**
-     * 源单单据类型
-     */
-    private String source_form_type;
-    /**
-     * 单据明细状态
-     */
-    private String status;
-
-    /**
-     * 物料标识
-     */
-    private String material_id;
-
-    /**
-     * 批次
-     */
-    private String pcsn;
-
-
-    /**
-     * 数量计量单位标识
-     */
-    private String unit_id;
-
-    /**
-     * 计划数量
-     */
-    private BigDecimal plan_qty;
-
-
-    /**
-     * 未分配数量(计划数量-载具物料数量)
-     */
-    private BigDecimal unassign_qty;
-
-    /**
-     * 分配数量
-     */
-    private BigDecimal assign_qty;
-    /**
-     * 分配的载具
-     */
-    private String vehicle_code;
-
-    /**
-     * 仓库
-     */
-    private String stor_code;
-    /**
-     * 仓位编码
-     */
-    private String struct_code;
-
-    /**
-     * 备注
-     */
-    private String remark;
-    /**
-     * 操作时间
-     */
-    private String update_time;
-
-
-    @TableField(typeHandler = FastjsonTypeHandler.class)
-    private JSONObject form_data;
-
-
-    private Boolean  in_storage  = Boolean.FALSE;
-
-
-}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/dao/mapper/StIvtIostorinvdtlOutMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/dao/mapper/StIvtIostorinvdtlOutMapper.java
deleted file mode 100644
index 9b8a563d..00000000
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/dao/mapper/StIvtIostorinvdtlOutMapper.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.nl.wms.stor_manage.io.service.out.iostor_dtl.dao.mapper;
-
-import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
-import org.apache.ibatis.annotations.Result;
-import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.Select;
-import org.nl.wms.stor_manage.io.service.in.iostor_dtl.dao.StIvtIostorinvdtl;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.nl.wms.stor_manage.io.service.out.iostor_dtl.dao.StIvtIostorinvdtlOut;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 出入库单明细表 Mapper 接口
- * </p>
- *
- * @author generator
- * @since 2024-03-29
- */
-public interface StIvtIostorinvdtlOutMapper extends BaseMapper<StIvtIostorinvdtlOut> {
-
-    Integer batchInsert(List<StIvtIostorinvdtlOut> dtls);
-
-    @Select("SELECT\n" +
-            "            sum(md_pb_vehicleMater.qty) as qty,\n" +
-            "            st_ivt_iostorinvdtl_out.*,\n" +
-            "            md_me_materialbase.material_code,\n" +
-            "            md_me_materialbase.material_name,\n" +
-            "            md_me_materialbase.material_spec\n" +
-            "        FROM\n" +
-            "            st_ivt_iostorinvdtl_out\n" +
-            "                LEFT JOIN md_me_materialbase ON st_ivt_iostorinvdtl_out.material_id = md_me_materialbase.material_id\n" +
-            "                LEFT JOIN md_pb_vehicleMater ON (st_ivt_iostorinvdtl_out.vehicle_code = md_pb_vehicleMater.vehicle_code\n" +
-            "                                                     and st_ivt_iostorinvdtl_out.material_id = md_pb_vehicleMater.material_id)\n" +
-            "        where inv_id = #{inv_id} GROUP BY st_ivt_iostorinvdtl_out.id")
-    @Results({@Result(property = "form_data",column = "form_data",typeHandler = FastjsonTypeHandler.class)})
-    List<Map> findByInv(String inv_id);
-
-
-}
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/dao/mapper/xml/StIvtIostorinvdtlOutMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/dao/mapper/xml/StIvtIostorinvdtlOutMapper.xml
deleted file mode 100644
index 1aaf5e5b..00000000
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/dao/mapper/xml/StIvtIostorinvdtlOutMapper.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.nl.wms.stor_manage.io.service.out.iostor_dtl.dao.mapper.StIvtIostorinvdtlOutMapper">
-
-    <insert id="batchInsert">
-        insert into st_ivt_iostorinvdtl_out() values <foreach collection="dtls" open="(" close=")" item="item">
-    </foreach>
-    </insert>
-</mapper>
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/monitor/listener/FlowEndEventListener.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/monitor/listener/FlowEndEventListener.java
index 76f154c5..e0442a0f 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/monitor/listener/FlowEndEventListener.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/monitor/listener/FlowEndEventListener.java
@@ -1,25 +1,17 @@
 package org.nl.wms.stor_manage.monitor.listener;
 
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.nl.common.domain.exception.BadRequestException;
 import org.nl.common.enums.StatusEnum;
 import org.nl.common.publish.AbstraceListener;
-import org.nl.wms.flow_manage.flow.framework.entity.ExecutionDto;
-import org.nl.wms.flow_manage.flow.service.execution.IFlowOperationService;
 import org.nl.wms.flow_manage.flow.service.history.IActHiExecutionService;
 import org.nl.wms.flow_manage.flow.service.history.dao.ActHiExecution;
 import org.nl.wms.flow_manage.monitor.event.FlowEndEvent;
-import org.nl.wms.flow_manage.monitor.event.FlowStartEvent;
 import org.nl.wms.pm_manage.form_data.service.IPmFormDataService;
 import org.nl.wms.stor_manage.io.service.in.iostor.IStIvtIostorinvInService;
 import org.nl.wms.stor_manage.io.service.in.iostor.dao.StIvtIostorinvIn;
-import org.nl.wms.stor_manage.io.service.out.iostor.IStIvtIostorinvOutService;
-import org.nl.wms.stor_manage.io.service.out.iostor.dao.StIvtIostorinvOut;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dto/StructattrVechielDto.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dto/StructattrVechielDto.java
index 68ddd6e5..ad1a5756 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dto/StructattrVechielDto.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dto/StructattrVechielDto.java
@@ -1,7 +1,6 @@
 package org.nl.wms.stor_manage.struct.service.dto;
 
 import lombok.Data;
-import org.nl.wms.md_manage.vehicleGroup.service.dao.MdPbVehicleMater;
 
 import java.math.BigDecimal;
 
@@ -10,7 +9,7 @@ import java.math.BigDecimal;
  * @Date 2023/5/4 19:49
  */
 @Data
-public class StructattrVechielDto extends MdPbVehicleMater {
+public class StructattrVechielDto extends org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater {
     private static final long serialVersionUID = 1L;
 
     /**
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java
index c20c204c..4d27ae22 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java
@@ -12,9 +12,11 @@ import org.nl.common.domain.entity.PageQuery;
 import org.nl.common.domain.exception.BadRequestException;
 import org.nl.common.enums.StatusEnum;
 import org.nl.common.utils.IdUtil;
-import org.nl.wms.md_manage.vehicleGroup.service.IMdPbVehicleMaterService;
-import org.nl.wms.md_manage.vehicleGroup.service.dao.MdPbVehicleMater;
+
+
 import org.nl.wms.flow_manage.flow.framework.process.nodeType.excess.impl.DecisionHandler;
+import org.nl.wms.md_manage.vehicleMater.service.IMdPbVehicleMaterService;
+import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater;
 import org.nl.wms.stor_manage.record.service.IStIvtStructivtflowService;
 import org.nl.wms.stor_manage.record.service.dao.StIvtStructivtflow;
 import org.nl.wms.stor_manage.struct.service.dao.StIvtStructattr;
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/controller/field_mapping/BmExternalFieldMappingController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/controller/field_mapping/BmExternalFieldMappingController.java
index b4e1de29..7dfc3940 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/controller/field_mapping/BmExternalFieldMappingController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/controller/field_mapping/BmExternalFieldMappingController.java
@@ -1,6 +1,9 @@
 package org.nl.wms.sync_manage.controller.field_mapping;
 
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONException;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.nl.common.TableDataInfo;
 import org.nl.common.domain.entity.PageQuery;
@@ -73,7 +76,10 @@ public class BmExternalFieldMappingController {
     public ResponseEntity<Object> getTableColumnNames(@PathVariable String table_name) {
         return new ResponseEntity<>(mappingsService.getTableColumnNames(table_name), HttpStatus.OK);
     }
-
+    @GetMapping("/getTableColumnNamesdata/{table_name}")
+    public ResponseEntity<Object> getTableColumnNamesdata(@PathVariable String table_name) {
+        return new ResponseEntity<>(mappingsService.getTableColumnNamesdata(table_name), HttpStatus.OK);
+    }
     @GetMapping("/getTableColumnNamesFromMapping/{table_name}")
     public ResponseEntity<Object> getTableColumnNamesFromMapping(@PathVariable String table_name) {
         return new ResponseEntity<>(mappingsService.getTableColumnNamesFromMapping(table_name), HttpStatus.OK);
@@ -88,5 +94,24 @@ public class BmExternalFieldMappingController {
     public ResponseEntity<Object> getExistTableName() {
         return new ResponseEntity<>(mappingsService.getExistTableName(), HttpStatus.OK);
     }
+    @PostMapping("/syncAnalyse")
+    public ResponseEntity<Object> syncAnalyse(@RequestBody JSONObject form){
+        String fromType=form.getString("local_table_name");
+        JSONArray formMapping = new JSONArray();
+        try {
+            JSONObject jsonObject = new JSONObject(form.getJSONObject("mapping_json"));
+            for (String key : jsonObject.keySet()) {
+                JSONObject item = new JSONObject();
+                item.put("key", key);
+                item.put("value", jsonObject.get(key));
+                formMapping.add(item);
+            }
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+//        JSONArray formMapping=form.getJSONArray("mapping_json");
+        String sourceString=form.getString("analyseData");
+        return new ResponseEntity<>(mappingsService.toJavaObject(JSONObject.class,fromType,formMapping,sourceString), HttpStatus.OK);
+    }
 }
 
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/service/field_mapping/IBmExternalFieldMappingService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/service/field_mapping/IBmExternalFieldMappingService.java
index 845be08d..356efe12 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/service/field_mapping/IBmExternalFieldMappingService.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/service/field_mapping/IBmExternalFieldMappingService.java
@@ -1,6 +1,7 @@
 package org.nl.wms.sync_manage.service.field_mapping;
 
 
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.wms.sync_manage.service.field_mapping.dao.BmExternalFieldMapping;
 import org.nl.wms.sync_manage.service.field_mapping.dto.RequestMappingParam;
@@ -26,6 +27,13 @@ public interface IBmExternalFieldMappingService extends IService<BmExternalField
      * @return
      */
     List<Map<String, String>> getTableColumnNames(String tableName);
+    /**
+     * 根据数据表名获取所有字段和注释
+     *
+     * @param tableName
+     * @return
+     */
+    List<Map<String, String>> getTableColumnNamesdata(String tableName);
 
     /**
      * 获取数据库中所有表的名称
@@ -56,6 +64,7 @@ public interface IBmExternalFieldMappingService extends IService<BmExternalField
      */
     void updateRows(RequestMappingParam param);
 
+    <T> List<T> toJavaObject(Class<T> clazz,String fromType, JSONArray formMapping, String sourceString);
     /**
      * 从映射关系表中获取已配置映射关系的
      *
@@ -63,4 +72,5 @@ public interface IBmExternalFieldMappingService extends IService<BmExternalField
      * @return
      */
     BmExternalFieldMapping getTableColumnNamesFromMapping(String table_name);
+
 }
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/service/field_mapping/dao/mapper/BmExternalFieldMappingMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/service/field_mapping/dao/mapper/BmExternalFieldMappingMapper.java
index adbac977..b98ef2fe 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/service/field_mapping/dao/mapper/BmExternalFieldMappingMapper.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/service/field_mapping/dao/mapper/BmExternalFieldMappingMapper.java
@@ -3,6 +3,7 @@ package org.nl.wms.sync_manage.service.field_mapping.dao.mapper;
 import org.apache.ibatis.annotations.Param;
 import org.nl.wms.sync_manage.service.field_mapping.dao.BmExternalFieldMapping;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.nl.wms.sync_manage.service.field_mapping.dto.RequestMappingParam;
 
 import java.util.List;
 import java.util.Map;
@@ -18,13 +19,26 @@ import java.util.Map;
 public interface BmExternalFieldMappingMapper extends BaseMapper<BmExternalFieldMapping> {
 
     /**
-     * 根据数据表名获取所有字段名称
+     * 根据数据表名获取所有字段名称和值
      *
      * @param tableName
      * @return
      */
     List<Map<String, String>> getTableColumnNames(@Param("tableName") String tableName);
-
+    /**
+     * 根据数据表名获取所有字段和注释
+     *
+     * @param tableName
+     * @return
+     */
+    List<Map<String, String>> getTableColumnNamesdata(String tableName);
+    /**
+     * 根据数据表名获取所有字段名称
+     *
+     * @param tableName
+     * @return
+     */
+    List<String> getTablename(@Param("tableName") String tableName);
     /**
      * 获取数据库中所有表的名称
      *
@@ -38,4 +52,5 @@ public interface BmExternalFieldMappingMapper extends BaseMapper<BmExternalField
      * @return
      */
     List<String> getExistTableName();
+
 }
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/service/field_mapping/dao/mapper/xml/BmExternalFieldMappingMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/service/field_mapping/dao/mapper/xml/BmExternalFieldMappingMapper.xml
index 2ccb40bc..db880457 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/service/field_mapping/dao/mapper/xml/BmExternalFieldMappingMapper.xml
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/service/field_mapping/dao/mapper/xml/BmExternalFieldMappingMapper.xml
@@ -10,7 +10,18 @@
         WHERE TABLE_SCHEMA = DATABASE()
           AND TABLE_NAME = #{tableName}
     </select>
-
+    <select id="getTableColumnNamesdata" resultType="map">
+       SELECT column_name, column_comment
+       FROM information_schema.columns
+       WHERE  table_name = #{tableName}
+    </select>
+    <select id="getTablename" resultType="java.lang.String">
+        SELECT COLUMN_NAME AS local_field_name,
+               COLUMN_COMMENT AS lable
+        FROM INFORMATION_SCHEMA.COLUMNS
+        WHERE TABLE_SCHEMA = DATABASE()
+          AND TABLE_NAME = #{tableName}
+    </select>
     <select id="getAllTableName" resultType="java.lang.String">
         SELECT TABLE_NAME
         FROM INFORMATION_SCHEMA.TABLES
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/service/field_mapping/dto/MappingDto.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/service/field_mapping/dto/MappingDto.java
index 57765290..3ec8e483 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/service/field_mapping/dto/MappingDto.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/service/field_mapping/dto/MappingDto.java
@@ -11,4 +11,5 @@ import lombok.Data;
 public class MappingDto {
     private String local_field_name;
     private String external_field_name;
+    private String skipExpression;
 }
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/service/field_mapping/impl/BmExternalFieldMappingServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/service/field_mapping/impl/BmExternalFieldMappingServiceImpl.java
index da78d51c..ff7420a5 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/service/field_mapping/impl/BmExternalFieldMappingServiceImpl.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/service/field_mapping/impl/BmExternalFieldMappingServiceImpl.java
@@ -2,14 +2,27 @@ package org.nl.wms.sync_manage.service.field_mapping.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
+import cn.hutool.core.lang.hash.Hash;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.nl.common.domain.exception.BadRequestException;
 import org.nl.common.utils.IdUtil;
+import org.nl.common.utils.ListOf;
+import org.nl.common.utils.MapOf;
 import org.nl.common.utils.SecurityUtils;
+import org.nl.wms.config_manage.form_struc.service.IBmFormStrucService;
+import org.nl.wms.config_manage.form_struc.service.dao.BmFormStruc;
+import org.nl.wms.flow_manage.flow.framework.engine.cmd.unify.Command;
+import org.nl.wms.pm_manage.form_data.service.IPmFormDataService;
+import org.nl.wms.pm_manage.form_data.service.impl.PmFormDataServiceImpl;
 import org.nl.wms.sync_manage.service.field_mapping.IBmExternalFieldMappingService;
 import org.nl.wms.sync_manage.service.field_mapping.dao.BmExternalFieldMapping;
 import org.nl.wms.sync_manage.service.field_mapping.dao.mapper.BmExternalFieldMappingMapper;
@@ -18,10 +31,11 @@ import org.nl.wms.sync_manage.service.field_mapping.dto.RequestMappingParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
+import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
+import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
 import java.util.*;
 import java.util.stream.Collectors;
-
+import java.util.List;
 /**
  * <p>
  * 同步字段映射表 服务实现类
@@ -35,11 +49,20 @@ public class BmExternalFieldMappingServiceImpl extends ServiceImpl<BmExternalFie
 
     @Autowired(required = false)
     private BmExternalFieldMappingMapper mappingMapper;
+    @Autowired(required = false)
+    private PmFormDataServiceImpl pmFormDataService;
+    @Autowired
+    private IBmFormStrucService formStrucService;
+
 
     @Override
     public List<Map<String, String>> getTableColumnNames(String tableName) {
         return mappingMapper.getTableColumnNames(tableName);
     }
+    @Override
+    public List<Map<String, String>> getTableColumnNamesdata(String tableName) {
+        return mappingMapper.getTableColumnNamesdata(tableName);
+    }
 
     @Override
     public List<String> getAllTableName() {
@@ -61,8 +84,18 @@ public class BmExternalFieldMappingServiceImpl extends ServiceImpl<BmExternalFie
         BmExternalFieldMapping mapping = param.getBmExternalFieldMapping();
         List<MappingDto> dtos = param.getDtos();
         Assert.notNull(dtos, "映射关系不能为空!");
-        Map<String, String> mappingJson = dtos.stream().collect(Collectors.toMap(MappingDto::getExternal_field_name, MappingDto::getLocal_field_name));
-        mapping.setMapping_json(JSON.toJSONString(mappingJson));
+        Map<String, Map<String, String>> mapOfMaps = new HashMap<>();
+        for(MappingDto mappingDto:dtos){
+            Map<String, String> map1 = new HashMap<>();
+            map1.put("external_field_name",mappingDto.getExternal_field_name());
+            if(ObjectUtil.isNotEmpty(mappingDto.getSkipExpression())) {
+                map1.put("skipExpression",mappingDto.getSkipExpression());
+            }else{
+                map1.put("skipExpression","");
+            }
+            mapOfMaps.put(mappingDto.getLocal_field_name(),map1);
+        }
+        mapping.setMapping_json(JSON.toJSONString(mapOfMaps));
         mapping.setId(IdUtil.getStringId());
         mapping.setLast_update_id(SecurityUtils.getCurrentUserId());
         mapping.setLast_update_name(SecurityUtils.getCurrentNickName());
@@ -78,34 +111,83 @@ public class BmExternalFieldMappingServiceImpl extends ServiceImpl<BmExternalFie
         luw.eq(BmExternalFieldMapping::getLocal_table_name, mapping.getLocal_table_name());
         List<MappingDto> dtos = param.getDtos();
         mappingMapper.delete(luw);
-        if (ObjectUtil.isNotEmpty(dtos)) {
-            Map<String, String> mappingJson = dtos.stream().collect(Collectors.toMap(MappingDto::getExternal_field_name, MappingDto::getLocal_field_name));
-            mapping.setMapping_json(JSON.toJSONString(mappingJson));
+        Map<String, Map<String, String>> mapOfMaps = new HashMap<>();
+        for(MappingDto mappingDto:dtos){
+            Map<String, String> map1 = new HashMap<>();
+            map1.put("external_field_name",mappingDto.getExternal_field_name());
+            if(ObjectUtil.isNotEmpty(mappingDto.getSkipExpression())) {
+                map1.put("skipExpression",mappingDto.getSkipExpression());
+            }else{
+                map1.put("skipExpression","");
+            }
+            mapOfMaps.put(mappingDto.getLocal_field_name(),map1);
+        }
+        mapping.setMapping_json(JSON.toJSONString(mapOfMaps));
             mapping.setId(IdUtil.getStringId());
             mapping.setLast_update_id(SecurityUtils.getCurrentUserId());
             mapping.setLast_update_name(SecurityUtils.getCurrentNickName());
             mapping.setLast_update_time(DateUtil.now());
             mappingMapper.insert(mapping);
         }
+
+    @Override
+    public <T> List<T> toJavaObject(Class<T> clazz, String fromType, JSONArray formMapping, String sourceString) {
+        BmFormStruc one = formStrucService.getOne(new QueryWrapper<BmFormStruc>().eq("form_type", fromType));
+        if (one == null) {
+            throw new BadRequestException("当前表单无配置信息" + fromType);
+        }
+        JSONObject sourceData = JSONObject.parseObject(sourceString);
+        if (StringUtils.isNotEmpty(one.getConvert_json())) {
+            sourceData = sourceData.getJSONObject(one.getConvert_json());
+        }
+        JSONArray mapping_arr = new JSONArray();
+        for (int i = 0; i < formMapping.size(); i++) {
+           JSONObject item = formMapping.getJSONObject(i);
+            String value = item.getString("key");
+            JSONObject mappingJson = item.getJSONObject("value");
+            String skipExpression = mappingJson.getString("skipExpression");
+            String mapping_field = mappingJson.getString("external_field_name");
+            mapping_arr.add(new JSONObject(MapOf.of("value",value,"skipExpression",skipExpression,"mapping_field",mapping_field)));
+
+        }
+        Map<String, JSONObject> fieldMapping = mapping_arr.stream().collect(HashMap::new, (formMap, o) -> {
+            JSONObject item = (JSONObject) o;
+            formMap.put(item.getString("value"), item);
+        }, HashMap::putAll);
+        List<String> fields=  mappingMapper.getTablename(fromType);
+        Set<String> set = new HashSet<>();
+        set.addAll(fields);
+        JSONObject target = pmFormDataService.fieldMapping(set,fieldMapping,sourceData);
+        T data = target.toJavaObject(clazz);
+        return ListOf.of(data);
     }
 
+
     @Override
     public BmExternalFieldMapping getTableColumnNamesFromMapping(String table_name) {
         LambdaQueryWrapper<BmExternalFieldMapping> lqw = new LambdaQueryWrapper<>();
         lqw.eq(BmExternalFieldMapping::getLocal_table_name, table_name);
         BmExternalFieldMapping mapping = mappingMapper.selectOne(lqw);
         String mapping_json = mapping.getMapping_json();
+        List<String> mapping_json1=mappingMapper.getTablename(table_name);
         if (StrUtil.isNotBlank(mapping_json)) {
-            Map<String, String> map = JSON.parseObject(mapping_json, Map.class);
-            List<MappingDto> list = new ArrayList<>();
-            map.forEach((key, value) -> {
-                MappingDto dto = new MappingDto();
-                dto.setExternal_field_name(key);
-                dto.setLocal_field_name(value);
-                list.add(dto);
-            });
-            mapping.setDtos(list);
+            List<MappingDto> list1 = new ArrayList<>();
+            JSONObject jsonObject = JSONObject.parseObject(mapping_json);
+            for (int i = 0; i < mapping_json1.size(); i++) {
+                MappingDto mappingDto=new MappingDto();
+                mappingDto.setLocal_field_name(mapping_json1.get(i));
+                if (jsonObject.getJSONObject(mapping_json1.get(i)) != null){
+                    mappingDto.setExternal_field_name(jsonObject.getJSONObject(mapping_json1.get(i)).getString("external_field_name"));
+                    mappingDto.setSkipExpression(jsonObject.getJSONObject(mapping_json1.get(i)).getString("skipExpression"));
+                } else {
+                    mappingDto.setExternal_field_name("");
+                    mappingDto.setSkipExpression("");
+                }
+                list1.add(mappingDto);
+            }
+            mapping.setDtos(list1);
         }
         return mapping;
     }
-}
+    }
+
diff --git a/wms_pro/qd/src/views/wms/early_manage/deferral_early/EditDialog.vue b/wms_pro/qd/src/views/wms/early_manage/deferral_early/EditDialog.vue
new file mode 100644
index 00000000..c519fc44
--- /dev/null
+++ b/wms_pro/qd/src/views/wms/early_manage/deferral_early/EditDialog.vue
@@ -0,0 +1,199 @@
+<template>
+  <el-dialog
+    :visible.sync="dialogVisible"
+    append-to-body
+    fullscreen
+    title="安全库存方案"
+    @close="close"
+    @open="open"
+  >
+    <el-card class="box-card" shadow="never">
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" disabled label-width="180px" size="mini">
+        <el-form-item label="方案名称">
+          <el-input v-model="form.alm_name" style="width: 200px;" />
+        </el-form-item>
+        <el-form-item label="仓库编码">
+          <el-input v-model="form.stor_code" style="width: 200px;" />
+        </el-form-item>
+        <el-form-item label="呆料天数">
+          <el-input v-model="form.stay_days" style="width: 200px;" />
+        </el-form-item>
+        <el-form-item label="报警通知类型">
+          <el-input v-model="form.notice_type" style="width: 200px;" />
+        </el-form-item>
+        <el-form-item label="描述">
+          <el-input v-model="form.remark" type="textarea" style="width: 200px;" />
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <div class="crud-opts2" style="margin-top: 30px;margin-bottom: 15px">
+      <span class="role-span">物料列表</span>
+      <span class="crud-opts-right2">
+        <!--左侧插槽-->
+        <slot name="left" />
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="queryDtl()"
+        >
+          添加物料
+        </el-button>
+      </span>
+
+    </div>
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      :data="form.tableData"
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      :highlight-current-row="true"
+      border
+      max-height="300"
+      style="width: 100%;"
+    >
+      <el-table-column v-if="false" label="物料ID" prop="material_id" />
+      <el-table-column label="物料编码" prop="material_code" />
+      <el-table-column label="物料名称" prop="material_name" />
+      <el-table-column label="物料规格" prop="material_spec" />
+      <el-table-column label="物料型号" prop="material_model" />
+      <el-table-column align="center" label="操作" width="160" fixed="right">
+        <template scope="scope">
+          <el-button
+            type="danger"
+            class="filter-item"
+            size="mini"
+            icon="el-icon-delete"
+            @click.native.prevent="deleteRow(scope.$index, form.tableData)"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="dialogVisible = false">关  闭</el-button>
+      <el-button type="primary" @click="submit">保  存</el-button>
+    </span>
+    <MaterialDtl ref="dtlRef" :dialog-show.sync="dtlShow" @tableChanged="tableChanged" />
+  </el-dialog>
+</template>
+
+<script>
+import { crud } from '@crud/crud'
+import MaterialDtl from './MaterialDtl'
+import deferral_early from './deferral_early'
+
+export default {
+  name: 'EditDialog',
+  components: { MaterialDtl },
+  dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'PDM_BI_ORDERTYPE', 'IS_OR_NOT'],
+  mixins: [crud()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    bussConfig: {
+      type: Object
+    },
+    openParam: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      form: {
+        id: null,
+        alm_name: null,
+        stor_code: null,
+        stay_days: null,
+        notice_type: null,
+        ext_json: null,
+        is_used: null,
+        remark: null,
+        create_name: null,
+        create_time: null,
+        tableData: []
+      },
+      dtlShow: false,
+      rules: {}
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    setForm(row) {
+      deferral_early.getDtl(row.id).then(res => {
+        this.form.tableData = res
+      })
+      this.dialogVisible = true
+      this.form.id = row.id
+      this.form.alm_name = row.alm_name
+      this.form.stor_code = row.stor_code
+      this.form.safety_qty = row.safety_qty
+      this.form.safety_day = row.safety_day
+      this.form.expression = row.expression
+      this.form.notice_type = row.notice_type
+      this.form.ext_json = row.ext_json
+    },
+    open() {
+    },
+    close() {
+      this.$emit('editChanged')
+    },
+    submit() {
+      deferral_early.saveDtl(this.form).then(res => {
+        this.$emit('editChanged')
+        this.dialogVisible = false
+        this.crud.notify('保存成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      })
+    },
+    async queryDtl() {
+      this.$refs.dtlRef.setForm(this.form.tableData)
+      this.dtlShow = true
+    },
+    deleteRow(index, rows) {
+      rows.splice(index, 1)
+    },
+    tableChanged(rows) {
+      const uniqueKey = 'material_id'
+      const newDataMap = new Map(rows.map(row => [row[uniqueKey], row]))
+      if (this.form.tableData.length > 0) {
+        rows.forEach(row => {
+          if (!this.form.tableData.some(dataRow => dataRow[uniqueKey] === row[uniqueKey])) {
+            this.form.tableData.push(row)
+          }
+        })
+      } else {
+        this.form.tableData = rows.slice() // 将 rows 中的数据复制到 tableData 中
+      }
+    }
+
+  }
+}
+</script>
+
+<style>
+.crud-opts2 {
+  padding: 0 0;
+  display: -webkit-flex;
+  display: flex;
+  align-items: center;
+}
+
+.crud-opts2 .crud-opts-right2 {
+  margin-left: auto;
+  padding: 4px 4px;
+}
+
+.input-with-select {
+  background-color: #fff;
+}
+</style>
diff --git a/wms_pro/qd/src/views/wms/early_manage/deferral_early/MaterialDtl.vue b/wms_pro/qd/src/views/wms/early_manage/deferral_early/MaterialDtl.vue
new file mode 100644
index 00000000..8ae5252e
--- /dev/null
+++ b/wms_pro/qd/src/views/wms/early_manage/deferral_early/MaterialDtl.vue
@@ -0,0 +1,164 @@
+<!--suppress ALL -->
+<template>
+  <el-dialog
+    title="物料信息"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    :show-close="false"
+    width="1000px"
+    @close="close"
+    @open="open"
+  >
+    <el-row>
+      <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-position="right"
+        label-width="80px"
+        label-suffix=":"
+      >
+        <el-form-item label="模糊查询">
+          <el-input
+            v-model="query.search"
+            clearable
+            style="width: 200px"
+            size="mini"
+            placeholder="输入物料编码或名称"
+            prefix-icon="el-icon-search"
+            class="filter-item"
+            @keyup.enter.native="crud.toQuery"
+          />
+        </el-form-item>
+        <rrOperation />
+
+      </el-form>
+    </el-row>
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      v-loading="crud.loading"
+      :data="crud.data"
+      style="width: 100%;"
+      border
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      @select="select"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" />
+      <el-table-column prop="material_code" label="物料编码" width="160" />
+      <el-table-column prop="material_name" label="物料名称" width="180" show-overflow-tooltip />
+      <el-table-column prop="material_spec" label="物料规格" width="140" />
+      <el-table-column prop="material_model" label="物料型号" />
+      <el-table-column prop="class_name" label="物料分类" width="140" />
+      <el-table-column prop="unit_name" label="计量单位" />
+      <el-table-column prop="net_weight" label="单重(g)" />
+      <el-table-column prop="product_series_name" label="系列" />
+    </el-table>
+    <!--分页组件-->
+    <pagination />
+    <span slot="footer" class="dialog-footer">
+      <el-button slot="left" type="info" @click="dialogVisible = false">关闭</el-button>
+      <el-button slot="left" type="primary" @click="submit">保存</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+
+import CRUD, { header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+
+export default {
+  name: 'AddDtl',
+  components: { rrOperation, pagination },
+  cruds() {
+    return CRUD({
+      title: '物料信息', idField: 'material_id', url: 'api/bmMaterial',
+      optShow: {
+        add: false,
+        edit: false,
+        del: false,
+        reset: true,
+        download: false
+      }
+    })
+  },
+  mixins: [presenter(), header()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    openParam: {
+      type: String
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      opendtlParam: '',
+      rows: [],
+      cacheRows: []
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    },
+    openParam: {
+      handler(newValue, oldValue) {
+        this.opendtlParam = newValue
+      }
+    }
+  },
+  methods: {
+    [CRUD.HOOK.afterRefresh]() {
+      this.selectRows(this.cacheRows)
+    },
+    open() {
+      this.crud.toQuery()
+    },
+    close() {
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+    },
+    selectRows(rows) {
+      const materialIds = rows.map(item => item.material_id)
+      this.$nextTick(() => {
+        this.crud.data.forEach(row => {
+          if (materialIds.includes(row.material_id)) {
+            this.$refs.table.toggleRowSelection(row, true)
+          }
+        })
+      })
+      this.crud.resetQuery(false)
+    },
+    setForm(rows) {
+      this.cacheRows = rows
+      this.selectRows(rows)
+    },
+    submit() {
+      this.rows = this.$refs.table.selection
+      if (this.rows.length <= 0) {
+        this.$message('请先勾选物料信息')
+        return
+      }
+      console.log(this.cacheRows)
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+      this.$emit('tableChanged', this.rows)
+    },
+    select(selections) {
+      console.log('+++')
+      console.log(selections)
+    },
+    handleSelectionChange(selections) {
+      const unselectedRowsIds = this.cacheRows.flat().map(row => row.material_code).filter(material_code => !selections.map(row => row.material_code).includes(material_code))
+    }
+  }
+}
+</script>
diff --git a/wms_pro/qd/src/views/wms/early_manage/deferral_early/UploadDialog.vue b/wms_pro/qd/src/views/wms/early_manage/deferral_early/UploadDialog.vue
index eb9cfcde..3d7704fa 100644
--- a/wms_pro/qd/src/views/wms/early_manage/deferral_early/UploadDialog.vue
+++ b/wms_pro/qd/src/views/wms/early_manage/deferral_early/UploadDialog.vue
@@ -38,7 +38,7 @@
 </template>
 
 <script>
-import crudClassstandard from './formstruc'
+import crudClassstandard from './deferral_early'
 import CRUD, { crud } from '@crud/crud'
 import { download2 } from '@/api/data'
 import { downloadFile } from '@/utils'
@@ -108,7 +108,6 @@ export default {
           this.$emit('tableChanged3', '')
           this.$emit('update:dialogShow', false)
         }).catch(err => {
-
           const list = err.response.data.message
           download2('/api/produceWorkorder/download', list).then(result => {
             downloadFile(result, '错误信息汇总', 'xlsx')
diff --git a/wms_pro/qd/src/views/wms/early_manage/deferral_early/ViewDialog.vue b/wms_pro/qd/src/views/wms/early_manage/deferral_early/ViewDialog.vue
new file mode 100644
index 00000000..541cfed6
--- /dev/null
+++ b/wms_pro/qd/src/views/wms/early_manage/deferral_early/ViewDialog.vue
@@ -0,0 +1,146 @@
+<template>
+  <el-dialog
+    :visible.sync="dialogVisible"
+    append-to-body
+    fullscreen
+    title="安全库存方案"
+    @close="close"
+    @open="open"
+  >
+    <el-card class="box-card" shadow="never">
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" disabled label-width="180px" size="mini">
+        <el-form-item label="方案名称">
+          <el-input v-model="form.alm_name" style="width: 200px;" />
+        </el-form-item>
+        <el-form-item label="仓库编码">
+          <el-input v-model="form.stor_code" style="width: 200px;" />
+        </el-form-item>
+        <el-form-item label="呆料天数">
+          <el-input v-model="form.stay_days" style="width: 200px;" />
+        </el-form-item>
+        <el-form-item label="报警通知类型">
+          <el-input v-model="form.notice_type" style="width: 200px;" />
+        </el-form-item>
+        <el-form-item label="描述">
+          <el-input v-model="form.remark" type="textarea" style="width: 200px;" />
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <div class="crud-opts2" style="margin-top: 30px;margin-bottom: 15px">
+      <span class="role-span">物料列表</span>
+      <span class="crud-opts-right2">
+        <!--左侧插槽-->
+        <slot name="left" />
+      </span>
+
+    </div>
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      :data="form.tableData"
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      :highlight-current-row="true"
+      border
+      max-height="300"
+      style="width: 100%;"
+    >
+      <el-table-column v-if="false" label="物料ID" prop="material_id" />
+      <el-table-column label="物料编码" prop="material_code" />
+      <el-table-column label="物料名称" prop="material_name" />
+      <el-table-column label="物料规格" prop="material_spec" />
+      <el-table-column label="物料型号" prop="material_model" />
+    </el-table>
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="dialogVisible = false">关  闭</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { crud } from '@crud/crud'
+import deferral_early from './deferral_early'
+
+export default {
+  name: 'ViewDialog',
+  components: {},
+  dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'PDM_BI_ORDERTYPE', 'IS_OR_NOT'],
+  mixins: [crud()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    bussConfig: {
+      type: Object
+    },
+    openParam: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      form: {
+        id: null,
+        alm_name: null,
+        stor_code: null,
+        stay_days: null,
+        notice_type: null,
+        ext_json: null,
+        is_used: null,
+        remark: null,
+        create_name: null,
+        create_time: null,
+        tableData: []
+      },
+      rules: {}
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    setForm(row) {
+      deferral_early.getDtl(row.id).then(res => {
+        this.form.tableData = res
+      })
+      this.dialogVisible = true
+      this.form.id = row.id
+      this.form.alm_name = row.alm_name
+      this.form.stor_code = row.stor_code
+      this.form.safety_qty = row.safety_qty
+      this.form.safety_day = row.safety_day
+      this.form.expression = row.expression
+      this.form.notice_type = row.notice_type
+      this.form.ext_json = row.ext_json
+    },
+    open() {
+    },
+    close() {
+      this.$emit('AddChanged')
+    }
+  }
+}
+</script>
+
+<style>
+.crud-opts2 {
+  padding: 0 0;
+  display: -webkit-flex;
+  display: flex;
+  align-items: center;
+}
+
+.crud-opts2 .crud-opts-right2 {
+  margin-left: auto;
+  padding: 4px 4px;
+}
+
+.input-with-select {
+  background-color: #fff;
+}
+</style>
diff --git a/wms_pro/qd/src/views/wms/early_manage/deferral_early/deferral_early.js b/wms_pro/qd/src/views/wms/early_manage/deferral_early/deferral_early.js
new file mode 100644
index 00000000..81910e89
--- /dev/null
+++ b/wms_pro/qd/src/views/wms/early_manage/deferral_early/deferral_early.js
@@ -0,0 +1,42 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/almEarlyDeferral',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/almEarlyDeferral/delete',
+    method: 'get',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/almEarlyDeferral/update',
+    method: 'post',
+    data
+  })
+}
+
+export function getDtl(id) {
+  return request({
+    url: 'api/almEarlyDeferral/dtl/' + id,
+    method: 'get'
+  })
+}
+
+export function saveDtl(data) {
+  return request({
+    url: 'api/almEarlyDeferral/saveDtl',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del, getDtl, saveDtl }
diff --git a/wms_pro/qd/src/views/wms/early_manage/deferral_early/formstruc.js b/wms_pro/qd/src/views/wms/early_manage/deferral_early/formstruc.js
deleted file mode 100644
index 3f6d1330..00000000
--- a/wms_pro/qd/src/views/wms/early_manage/deferral_early/formstruc.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import request from '@/utils/request'
-
-export function add(data) {
-  return request({
-    url: 'api/bmFormStruc',
-    method: 'post',
-    data
-  })
-}
-
-export function del(ids) {
-  return request({
-    url: 'api/bmFormStruc/delete',
-    method: 'get',
-    data: ids
-  })
-}
-
-export function edit(data) {
-  return request({
-    url: 'api/bmFormStruc/update',
-    method: 'post',
-    data
-  })
-}
-
-export function getTypes(params) {
-  return request({
-    url: 'api/bmFormStruc/getTypes',
-    method: 'get',
-    params
-  })
-}
-
-export default { add, edit, del, getTypes}
diff --git a/wms_pro/qd/src/views/wms/early_manage/deferral_early/index.vue b/wms_pro/qd/src/views/wms/early_manage/deferral_early/index.vue
index 9f2d1212..1006cabd 100644
--- a/wms_pro/qd/src/views/wms/early_manage/deferral_early/index.vue
+++ b/wms_pro/qd/src/views/wms/early_manage/deferral_early/index.vue
@@ -11,21 +11,25 @@
           label-width="90px"
           label-suffix=":"
         >
-          <el-form-item label="表单类型">
+          <el-form-item label="方案名称">
+            <el-input v-model="query.search" style="width: 150px;" />
+          </el-form-item>
+          <el-form-item label="仓库编码">
             <el-select
-              v-model="query.form_type"
+              v-model="query.stor_code"
               placeholder="请选择类型"
               clearable
               filterable
               size="mini"
               class="filter-item"
-              style="width: 185px;">
+              style="width: 185px;"
+            >
               <el-option
-                v-for="item in form_types"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-              </el-option>
+                v-for="item in storList"
+                :key="item.stor_id"
+                :label="item.stor_code"
+                :value="item.stor_code"
+              />
             </el-select>
           </el-form-item>
           <rrOperation :crud="crud" />
@@ -33,6 +37,17 @@
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          :disabled="crud.selections.length !== 1"
+          icon="el-icon-s-data"
+          size="mini"
+          type="info"
+          @click="edit(crud.selections[0])"
+        >
+          修改明细
+        </el-button>
       </crudOperation>
       <!--表单组件-->
       <el-dialog
@@ -42,92 +57,65 @@
         :title="crud.status.title"
         width="600px"
       >
-        <el-form ref="form" :model="form"  size="mini" label-width="80px">
+        <el-form ref="form" :rules="rules" :model="form" size="mini" label-width="110px">
           <el-row>
-            <el-col :span="8">
-              <el-form-item label="表单类型" prop="class_code">
-                <el-input v-model="form.form_type" style="width: 120px;" />
+            <el-col :span="12">
+              <el-form-item label="方案名称" prop="alm_name">
+                <el-input v-model="form.alm_name" style="width: 150px;" />
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="表单名称" prop="class_name">
-                <el-input v-model="form.form_name" style="width: 120px;" />
+            <el-col :span="12">
+              <el-form-item label="仓库编码" prop="stor_code">
+                <el-select v-model="form.stor_code" placeholder="请选择" style="width: 150px;">
+                  <el-option
+                    v-for="item in storList"
+                    :key="item.stor_id"
+                    :label="item.stor_code"
+                    :value="item.stor_code"
+                  />
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
-            <el-col >
-              <el-form-item label="表单描述" prop="class_name">
-                <el-input v-model="form.form_desc" style="width: 370px;" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col >
-              <el-form-item label="是否含有子表" prop="class_name">
-                <el-radio-group v-model="form.has_child" style="width: 140px">
-                  <el-radio label=true>是</el-radio>
-                  <el-radio label=false>否</el-radio>
+            <el-col :span="12">
+              <el-form-item label="通知类型" prop="notice_type">
+                <el-radio-group v-model="form.notice_type" style="width: 150px">
+                  <el-radio label="1">站内信</el-radio>
+                  <el-radio label="2">微信</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col v-if="form.has_child">
-              <el-select
-                v-model="form.parent_id"
-                placeholder="子表id"
-                clearable
-              >
-                <el-option
-                  v-for="item in form_types"
-                  :key="item.id"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="业务表id映射" prop="class_desc">
-                <el-input v-model="form.biz_id" style="width: 120px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="业务表编码映射" prop="class_desc">
-                <el-input v-model="form.biz_code" style="width: 120px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="业务表时间映射" prop="class_desc">
-                <el-input v-model="form.bus_data" style="width: 120px;" />
+            <el-col :span="12">
+              <el-form-item label="是否启用" prop="is_used">
+                <el-radio-group v-model="form.is_used" style="width: 150px">
+                  <el-radio label="true">是</el-radio>
+                  <el-radio label="false">否</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="8">
-              <el-form-item label="业务表状态映射" prop="class_desc">
-                <el-input v-model="form.biz_status" style="width: 120px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="物料id映射" prop="class_desc">
-                <el-input v-model="form.material_id" style="width: 120px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="物料数量映射" prop="class_desc">
-                <el-input v-model="form.qty" style="width: 120px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="物料批次映射" prop="class_desc">
-                <el-input v-model="form.pcsn" style="width: 120px;" />
+            <el-col :span="12">
+              <el-form-item label="呆料天数" prop="stay_days">
+                <el-input v-model="form.stay_days" style="width: 150px;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="自定义映射" prop="ext_json">
+                <el-input v-model="form.ext_json" type="textarea" style="width: 430px;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="备注" prop="remark">
+                <el-input v-model="form.remark" type="textarea" style="width: 430px;" />
               </el-form-item>
             </el-col>
           </el-row>
-          <el-form-item label="自定义映射" prop="class_desc">
-            <el-input type="textarea" v-model="form.form_param" style="width: 370px;" />
-          </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="text" @click="crud.cancelCU">取消</el-button>
@@ -139,33 +127,31 @@
         ref="table"
         v-loading="crud.loading"
         lazy
-        :load="getClassDatas"
-        :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
         :data="crud.data"
         row-key="id"
         @select="crud.selectChange"
         @select-all="crud.selectAllChange"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column prop="form_type" label="表单类型" min-width="150"/>
-        <el-table-column prop="form_name" label="表单名称" min-width="150"/>
-        <el-table-column prop="form_desc" label="描述" min-width="150"/>
-        <el-table-column prop="create_time" label="创建时间" min-width="150"/>
-        <el-table-column prop="has_child" :formatter="booleanFormat" label="是否关联子表" />
-        <el-table-column prop="parent_id" label="父表id" min-width="150"/>
-        <el-table-column prop="biz_id" label="业务单据id映射" min-width="150"/>
-        <el-table-column prop="biz_code" label="业务单据code映射" min-width="150"/>
-        <el-table-column prop="biz_form_type" label="业务单据type映射" min-width="150"/>
-        <el-table-column prop="biz_date" label="业务单据时间映射" min-width="150"/>
-        <el-table-column prop="status" label="业务单据状态映射" min-width="150"/>
-        <el-table-column prop="material_id" label="物料id映射" min-width="150"/>
-        <el-table-column prop="qty" label="物料数量映射" min-width="150"/>
-        <el-table-column prop="pcsn" label="物料批次映射" min-width="150" />
-        <el-table-column show-overflow-tooltip prop="form_param" :formatter="jsonFormat" label="自定义字段映射" />
+        <el-table-column type="selection" width="55" />
+        <el-table-column prop="alm_name" label="安全库存方案" min-width="120" show-tooltip-when-overflow>
+          <template slot-scope="scope">
+            <el-link type="warning" @click="toView(scope.row)">{{ scope.row.alm_name }}</el-link>
+          </template>
+        </el-table-column>
+        <el-table-column prop="stor_code" label="仓库编码" show-tooltip-when-overflow />
+        <el-table-column prop="stay_days" label="呆料天数" min-width="120" show-tooltip-when-overflow />
+        <el-table-column prop="notice_type" label="通知类型" show-tooltip-when-overflow />
+        <el-table-column prop="ext_json" label="扩展信息" show-tooltip-when-overflow />
+        <el-table-column prop="remark" label="描述" show-tooltip-when-overflow />
+        <el-table-column prop="create_id" label="创建人" show-tooltip-when-overflow />
+        <el-table-column prop="create_time" label="创建时间" show-tooltip-when-overflow />
+        <el-table-column prop="is_used" :formatter="jsonFormat" label="是否启用" />
         <el-table-column
           label="操作"
           width="250px"
           align="center"
+          fixed="right"
         >
           <template slot-scope="scope">
             <udOperation
@@ -176,58 +162,54 @@
               :disabled-dle="scope.row.is_modify === '0'"
               msg="确定删除吗,如果存在下级节点则一并删除，此操作不能撤销！"
             />
-            <el-button slot="right" size="mini" type="text" icon="el-icon-circle-plus-outline" @click="crud.toAddAndData(addSibling(scope.row))">新增同级</el-button>
-            <el-button slot="right" size="mini" type="text" icon="el-icon-circle-plus" @click="crud.toAddAndData(addChildren(scope.row))">新增子级</el-button>
           </template>
         </el-table-column>
       </el-table>
       <!--分页组件-->
       <pagination />
     </div>
-    <UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="crud.toQuery()"/>
+    <ViewDialog ref="itemview" />
+    <EditDialog ref="editDialog" :dialog-show.sync="editShow" @editChanged="crud.toQuery()" />
+    <UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="crud.toQuery()" />
   </div>
 </template>
 
 <script>
-import formstruc from './formstruc'
+import deferral_early from './deferral_early'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
-import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import ViewDialog from './ViewDialog'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import rrOperation from '@crud/RR.operation'
 import pagination from '@crud/Pagination'
 import UploadDialog from './UploadDialog'
+import EditDialog from './EditDialog'
+import crudStorattr from '@/views/wms/base_manage/stor/storattr'
 
 const defaultForm = {
-  form_type: null,
-  form_name: null,
-  form_desc: null,
-  create_time: null,
-  create_id: null,
-  biz_id: null,
-  biz_code: null,
-  biz_date: null,
-  biz_status: null,
-  material_id: null,
-  qty: null,
-  pcsn: null,
-  form_param: null,
-  has_child: false,
-  parent_id: null
+  id: null,
+  alm_name: null,
+  stor_code: null,
+  stay_days: null,
+  notice_type: null,
+  ext_json: null,
+  is_used: null,
+  remark: null,
+  create_name: null,
+  create_time: null
 }
 export default {
-  name: 'FormStruc',
+  name: 'DeferralEarly',
   dicts: ['base_data'],
-  components: {UploadDialog, pagination, crudOperation, rrOperation, udOperation, Treeselect },
+  components: { UploadDialog, pagination, crudOperation, rrOperation, udOperation, ViewDialog, EditDialog },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({
-      title: '基础类别',
-      url: 'api/bmFormStruc',
+      title: '呆料预警',
+      url: '/api/almEarlyDeferral',
       idField: 'id',
       sort: 'id,desc',
-      crudMethod: { ...formstruc },
+      crudMethod: { ...deferral_early },
       optShow: {
         add: true,
         reset: true
@@ -238,18 +220,30 @@ export default {
     return {
       classes: [],
       uploadShow: false,
-      form_types: [],
-      permission: {}
+      editShow: false,
+      storList: [],
+      permission: {},
+      rules: {
+        stor_code: [
+          { required: true, message: '仓库编码不能为空', trigger: 'blur' }
+        ],
+        stay_days: [
+          { required: true, message: '呆料天数不能为空', trigger: 'blur' }
+        ]
+      }
     }
   },
   created() {
-    this.getFormSelect() // 获取分类
+    crudStorattr.getStor({}).then(res => {
+      this.storList = res
+    })
   },
   methods: {
-    getFormSelect() {
-      formstruc.getTypes().then((res) => { // 获取分类名称，查询根据分类编码查找对应分支树
-        this.form_types = res
-      })
+
+    toView(row) {
+      if (row !== null) {
+        this.$refs.itemview.setForm(row)
+      }
     },
     booleanFormat(row, index) {
       if (row.has_child) {
@@ -263,6 +257,10 @@ export default {
         return JSON.stringify(row.form_param)
       }
       return ''
+    },
+    edit(row) {
+      this.$refs.editDialog.setForm(row)
+      this.editShow = true
     }
   }
 }
diff --git a/wms_pro/qd/src/views/wms/pm_manage/form_data/index.vue b/wms_pro/qd/src/views/wms/pm_manage/form_data/index.vue
index 1b9bacb7..02d71948 100644
--- a/wms_pro/qd/src/views/wms/pm_manage/form_data/index.vue
+++ b/wms_pro/qd/src/views/wms/pm_manage/form_data/index.vue
@@ -28,13 +28,13 @@
               />
             </el-select>
           </el-form-item>
-          <template v-if="hideShowDialog" v-for="(col,index) in cols">
+          <template v-for="(col,index) in cols" v-if="hideShowDialog">
             <el-form-item label="col.lable">
               <label slot="label">{{ col.lable }}:</label>
-              <el-input v-model="query.form_query[col.value]" :value="col.value" clearable style="width: 210px"/>
+              <el-input v-model="query.form_query[col.value]" :value="col.value" clearable style="width: 210px" />
             </el-form-item>
           </template>
-          <rrOperation :crud="crud"/>
+          <rrOperation :crud="crud" />
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -71,8 +71,7 @@
           icon="el-icon-view"
           size="mini"
           @click="hideShow"
-        >
-        </el-button>
+        />
       </crudOperation>
 
       <!--表格渲染-->
@@ -82,23 +81,23 @@
         lazy
         :data="crud.data"
       >
-        <el-table-column type="selection" width="55"/>
+        <el-table-column type="selection" width="55" />
         <el-table-column prop="code" label="单据编码" show-overflow-tooltip width="120">
           <template slot-scope="scope">
             <el-link v-if="scope.row.hasChildren" type="warning" @click="toView(scope.row)">{{
-                scope.row.code
-              }}
+              scope.row.code
+            }}
             </el-link>
             <span v-else>{{ scope.row.code }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="form_type" label="单据类型" show-overflow-tooltip width="120"/>
-        <el-table-column prop="biz_code" label="业务单据编码" show-overflow-tooltip width="120"/>
-        <el-table-column prop="biz_date" label="业务单据时间" show-overflow-tooltip width="130"/>
-        <el-table-column prop="material_id" label="物料id" show-overflow-tooltip width="120"/>
-        <el-table-column prop="pcsn" label="批次" show-overflow-tooltip width="120"/>
-        <el-table-column prop="qty" label="物料数量" show-overflow-tooltip/>
-        <el-table-column prop="vehicle_code" label="载具编号" show-overflow-tooltip width="120"/>
+        <el-table-column prop="form_type" label="单据类型" show-overflow-tooltip width="120" />
+        <el-table-column prop="biz_code" label="业务单据编码" show-overflow-tooltip width="120" />
+        <el-table-column prop="biz_date" label="业务单据时间" show-overflow-tooltip width="130" />
+        <el-table-column prop="material_id" label="物料id" show-overflow-tooltip width="120" />
+        <el-table-column prop="pcsn" label="批次" show-overflow-tooltip width="120" />
+        <el-table-column prop="qty" label="物料数量" show-overflow-tooltip />
+        <el-table-column prop="vehicle_code" label="载具编号" show-overflow-tooltip width="120" />
         <el-table-column prop="status" label="单据状态" show-overflow-tooltip width="120">
           <template slot-scope="scope">
             <template v-for="item in formStatus">
@@ -106,13 +105,18 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column prop="proc_inst_id" label="对应流程实例id" show-overflow-tooltip width="120"/>
-        <el-table-column prop="parent_id" label="父单据数据id" show-overflow-tooltip width="120"/>
-        <el-table-column width="130" show-overflow-tooltip v-for="(item, index) in cols" :key="item.value"
-                         :label="item.lable">
+        <el-table-column prop="proc_inst_id" label="对应流程实例id" show-overflow-tooltip width="120" />
+        <el-table-column prop="parent_id" label="父单据数据id" show-overflow-tooltip width="120" />
+        <el-table-column prop="create_time" label="创建时间" />
+        <el-table-column
+          v-for="(item, index) in cols"
+          :key="item.value"
+          width="130"
+          show-overflow-tooltip
+          :label="item.lable"
+        >
           <template slot-scope="scope">{{ scope.row.form_data[item.value] }}</template>
         </el-table-column>
-        <el-table-column prop="create_time" label="创建时间"/>
         <el-table-column
           v-permission="['admin','Classstandard:edit','Classstandard:del']"
           label="操作"
@@ -133,15 +137,15 @@
         </el-table-column>
       </el-table>
       <!--分页组件-->
-      <pagination/>
+      <pagination />
     </div>
-    <ViewDialog ref="viewDialog"/>
+    <ViewDialog ref="viewDialog" />
   </div>
 </template>
 
 <script>
 import crudFormData from './formData'
-import CRUD, {crud, form, header, presenter} from '@crud/crud'
+import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import rrOperation from '@crud/RR.operation'
@@ -151,7 +155,7 @@ import ViewDialog from './ViewDialog'
 
 // import UploadDialog from './UploadDialog'
 
-let defaultForm = {
+const defaultForm = {
   id: null,
   code: null,
   proc_inst_id: null,
@@ -172,7 +176,7 @@ let defaultForm = {
 export default {
   name: 'FormData',
   dicts: ['base_data'],
-  components: {pagination, crudOperation, rrOperation, udOperation, ViewDialog},
+  components: { pagination, crudOperation, rrOperation, udOperation, ViewDialog },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({
@@ -180,7 +184,7 @@ export default {
       url: 'api/pmFormData',
       idField: 'id',
       sort: 'id,desc',
-      crudMethod: {...crudFormData},
+      crudMethod: { ...crudFormData },
       optShow: {
         add: true,
         reset: true
@@ -218,7 +222,6 @@ export default {
   created() {
     // 获取分类
     this.getFromTypes()
-
   },
   mounted() {
   },
@@ -228,7 +231,7 @@ export default {
         formstruc.getHeader(this.query.form_type).then(res => {
           this.cols = res
           res.forEach(a => {
-            this.form.form_data[a.value,'']
+            this.form.form_data[a.value, '']
             this.$set(this.query, 'form_query', {})
           })
         })
@@ -247,7 +250,7 @@ export default {
     },
     hideShow() {
       if (this.hideShowDialog) {
-        //this.$set(this.query, 'form_query', {})
+        // this.$set(this.query, 'form_query', {})
       }
       this.hideShowDialog = !this.hideShowDialog
     },
@@ -255,7 +258,7 @@ export default {
       if (row !== null) {
         this.$refs.viewDialog.setForm(row)
       }
-    },
+    }
   }
 }
 </script>
diff --git a/wms_pro/qd/src/views/wms/stor_manage/in/TaskDialog.vue b/wms_pro/qd/src/views/wms/stor_manage/in/TaskDialog.vue
new file mode 100644
index 00000000..b0753f20
--- /dev/null
+++ b/wms_pro/qd/src/views/wms/stor_manage/in/TaskDialog.vue
@@ -0,0 +1,404 @@
+<template>
+  <el-dialog
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    :show-close="false"
+    fullscreen
+    @close="close"
+    @open="open"
+  >
+
+    <el-row v-show="crud.status.cu > 0" :gutter="20">
+      <el-col :span="20" style="border: 1px solid white">
+        <span />
+      </el-col>
+      <el-col :span="4">
+        <span>
+          <el-button icon="el-icon-check" size="mini" :loading="crud.cu === 2" type="primary" @click="crud.submitCU">保存</el-button>
+          <el-button icon="el-icon-close" size="mini" type="info" @click="crud.cancelCU">关闭</el-button>
+        </span>
+      </el-col>
+    </el-row>
+
+    <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="85px" label-suffix=":">
+      <el-form-item label="单据号" prop="code">
+        <el-input v-model="form.code" disabled placeholder="系统生成" clearable style="width: 150px" />
+      </el-form-item>
+      <el-form-item label="业务类型" prop="status">
+        <el-select disabled
+          v-model="form.bill_type"
+          style="width: 100px; height: 35px;top: -5px;"
+          placeholder="业务类型"
+        >
+          <el-option
+            v-for="item in statusEnum.IOBILL_TYPE_OUT"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="单据状态" prop="status">
+        <el-input v-model="form.status" disabled placeholder="生成" clearable style="width: 150px" />
+      </el-form-item>
+      <el-form-item label="源单类型" prop="source_form_type">
+        <el-input v-model="form.source_form_type"  disabled style="width: 150px" />
+      </el-form-item>
+      <el-form-item label="源单id" prop="source_form_id">
+        <el-input v-model="form.source_form_id"  disabled style="width: 150px" />
+      </el-form-item>
+      <el-form-item label="源单时间" prop="source_form_date">
+        <el-input v-model="form.source_form_date"  disabled style="width: 150px" />
+      </el-form-item>
+      <template v-for="(col,index) in cols">
+        <el-form-item label="col.lable" prop="bill_code">
+          <label slot="label">{{col.lable}}:</label>
+          <el-input v-model="form.form_data[col.value]" :value="col.value" disabled style="width: 150px" />
+        </el-form-item>
+      </template>
+      <el-form-item label="备注" prop="remark">
+        <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
+        <el-input v-model="form.remark" disabled style="width: 380px;" rows="2" type="textarea"  />
+      </el-form-item>
+    </el-form>
+    <div class="crud-opts2">
+      <span class="role-span">出库明细</span>
+      <span class="crud-opts-right2">
+        <!--左侧插槽-->
+        <slot name="left"/>
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          :disabled="!divflag"
+          @click="divVehicle()"
+        >
+          分配载具
+        </el-button>
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          :disabled="divflag"
+          @click="divCancel()"
+        >
+          取消分配
+        </el-button>
+      </span>
+    </div>
+    <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        :data="tableData"
+        style="width: 100%;"
+        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+        :highlight-current-row="true"
+        @current-change="handleCurrentDtl"
+        border
+      >
+        <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" />
+        <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" />
+        <el-table-column show-overflow-tooltip prop="material_spec" label="物料规格" />
+        <el-table-column show-overflow-tooltip prop="pcsn" label="批次" />
+        <el-table-column show-overflow-tooltip prop="qty" label="数量" />
+        <el-table-column show-overflow-tooltip prop="unit_id" label="单位" align="center" />
+        <el-table-column show-overflow-tooltip prop="stor_code" label="仓库" />
+        <el-table-column show-overflow-tooltip prop="vehicle_code" label="载具编码"  width="160"/>
+        <el-table-column show-overflow-tooltip prop="source_form_type" label="源单类型" />
+        <el-table-column show-overflow-tooltip prop="source_form_id" label="源单id" />
+        <el-table-column width="130" show-overflow-tooltip  v-for="(item, index) in dtlCols" :key="item.value"  :label="item.lable" >
+          <template slot-scope="scope">{{scope.row.form_data[item.value]}}</template>
+        </el-table-column>
+        <el-table-column show-overflow-tooltip prop="remark" label="备注" />
+      </el-table>
+    </el-card>
+    <div class="crud-opts2">
+      <span class="role-span">作业明细</span>
+    </div>
+    <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
+      <!--表格渲染-->
+      <el-table
+        ref="table2"
+        :data="tabledis"
+        style="width: 100%;"
+        max-height="300"
+        size="mini"
+        border
+        :highlight-current-row="true"
+        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      >
+        <el-table-column show-overflow-tooltip prop="vehicle_code" label="托盘号" align="center" />
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
+        <el-table-column prop="pcsn" label="批次" align="center" width="150" />
+        <el-table-column prop="qty" :formatter="crud.formatNum3" label="数量" align="center" />
+        <el-table-column min-width="120" show-overflow-tooltip prop="stor_code" label="仓库" align="center" />
+        <el-table-column min-width="120" show-overflow-tooltip prop="struct_code" label="载具所在仓位" align="center" />
+        <el-table-column prop="point_code1" label="任务起始位置" align="center" width="120"/>
+        <el-table-column prop="point_code2" label="任务目的位置" align="center" width="120"/>
+        <el-table-column prop="task_code" label="任务号" align="center" />
+        <el-table-column prop="status" label="任务状态" align="center" :formatter="formatStatus"/>
+        <el-table-column prop="source_form_type" label="源单类型" align="center" width="150"/>
+        <el-table-column show-overflow-tooltip prop="source_form_id" label="源单id" align="center" width="150"/>
+      </el-table>
+    </el-card>
+    <el-dialog
+      :close-on-click-modal="false"
+      :visible.sync="dialogVehicle"
+      title="载具分配"
+      width="700px"
+    >
+      <el-form  :model="vehicleform"  size="mini" label-width="110px">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="物料编码" prop="material_code">
+              <el-input v-model="vehicleform.material_code" disabled style="width: 150px;" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="物料数量" prop="qty">
+              <el-input v-model="vehicleform.qty" disabled style="width: 150px;" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
+        <!--表格渲染-->
+        <span  class="crud-opts-right2">
+        <!--左侧插槽-->
+        <slot name="left" />
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="addVehicledis"
+        >
+          新增一行
+        </el-button>
+      </span>
+        <el-table
+          ref="table2"
+          :data="vehicledis"
+          size="mini"
+          border
+          :highlight-current-row="true"
+          :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+        >
+          <el-table-column show-overflow-tooltip prop="vehicle_code" label="托盘号" align="center" >
+            <template slot-scope="scope">
+              <el-input v-model="vehicledis[scope.$index].vehicle_code" clearable />
+            </template>
+          </el-table-column>
+          <el-table-column min-width="120" show-overflow-tooltip prop="qty" label="物料数量" align="center" >
+            <template slot-scope="scope">
+              <el-input-number v-model="vehicledis[scope.$index].qty" clearable />
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="操作" width="160" fixed="right">
+            <template scope="scope">
+              <el-button  type="danger"  size="mini" icon="el-icon-delete" @click="subRow(scope.$index, scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-row :gutter="20">
+          <el-col :span="16" style="border: 1px solid white">
+            <span />
+          </el-col>
+          <el-col :span="3">
+            <el-button icon="el-icon-check" size="mini"  type="primary" @click="submitDialogVehicle">保存</el-button>
+          </el-col>
+          <el-col :span="3">
+            <el-button icon="el-icon-close" size="mini" type="info" @click="closeDialogVehicle">关闭</el-button>
+          </el-col>
+        </el-row>
+      </el-card>
+    </el-dialog>
+  </el-dialog>
+
+</template>
+
+<script>
+import CRUD, { crud } from '@crud/crud'
+import crudProduct from '@/views/wms/stor_manage/in/storinvin'
+import formstruc from '@/views/wms/config_manage/formStruc/formstruc'
+
+
+export default {
+  name: 'TaskDialog',
+  components: { },
+  mixins: [crud()],
+  dicts: ['IO_BILL_STATUS', 'VEHICLE_OVER_TYPE', 'PCS_SAL_TYPE'],
+  statusEnums: [ 'IOBILL_TYPE_OUT','FORM_STATUS' ],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    openParam: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    storId: {
+      type: String,
+      default: null
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      dialogVehicle: false,
+      divflag: false,
+      cols: [],
+      dtlCols: [],
+      tableData: [],
+      tabledis: [],
+      vehicledis: [],
+      vehicleform:{},
+      currentDtl: null,
+      form: {
+        id: '',
+        code: '',
+        bill_type: '',
+        status: '',
+        product_area: '',
+        source_form_type: '',
+        source_form_id: '',
+        source_form_date: '',
+        create_name: '',
+        create_time: '',
+        update_name: '',
+        update_time: '',
+        remark: '',
+        form_data: {}
+      },
+      rules: {}
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+      formstruc.getHeader('st_ivt_iostorinv').then(res => {
+        this.cols = res
+      })
+      formstruc.getHeader('st_ivt_iostorinvdtl').then(res => {
+        this.dtlCols = res
+      })
+    },
+    setForm(row) {
+      this.dialogVisible = true
+      this.form = row
+      this.currentDtl = null
+      crudProduct.getIosInvDtl(row.id).then(res => {
+        this.tableData = res
+      })
+    },
+    addVehicledis(){
+      this.vehicledis.push({ vehicle_code: '', qty: 0 })
+    },
+    subRow(index,row){
+      this.vehicledis.slice(index,1)
+    },
+    handleCurrentDtl(row){
+      this.currentDtl = row
+      if (this.currentDtl.struct_code != null){
+        this.divflag = false;
+      }else {
+        this.divflag = true;
+      }
+    },
+    divVehicle() {
+      if (!this.currentDtl) {
+        this.crud.notify('请先选择一条分配明细！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      this.dialogVehicle = true
+      this.vehicleform = this.currentDtl
+    },
+    divCancel() {
+      if (!this.currentDtl) {
+        this.crud.notify('请先选择一条分配明细！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      crudProduct.cancelDecision(this.currentDtl).then(res => {
+        crudProduct.getIosInvDtl(this.form.id).then(res => {
+          this.tableData = res
+        })
+      })
+      this.tabledis = []
+    },
+    formatStatus(row) {
+      return this.statusEnum.label.FORM_STATUS[row.status]
+    },
+    closeDialogVehicle(){
+      this.dialogVehicle = false
+      this.vehicledis = []
+      this.vehicleform = {}
+    },
+    submitDialogVehicle(){
+      this.vehicleform.item = this.vehicledis
+      crudProduct.confirmvehicle(this.vehicleform).then(res => {
+        this.crud.notify('载具分配成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.dialogVehicle = false
+        this.vehicledis = []
+        this.vehicleform = {}
+        this.setForm(this.form)
+      })
+    },
+    close() {
+      this.form.tableMater = []
+      this.form.dtl_row = null
+      this.form.bucketunique = null
+      this.sectProp = null
+      this.$emit('update:dialogShow', false)
+      this.$emit('AddChanged')
+      this.crud.refresh()
+      this.$refs['form2'].resetFields()
+    }
+  }
+}
+</script>
+
+<style>
+.crud-opts2 {
+  padding: 0;
+  display: -webkit-flex;
+  display: flex;
+  align-items: center;
+}
+
+.crud-opts2 .el-dialog__title2 {
+  line-height: 24px;
+  font-size: 20px;
+  color: #303133;
+}
+
+.crud-opts2 .role-span {
+  padding: 10px 0px 10px 0px;
+}
+
+.crud-opts2 .crud-opts-form {
+  padding: 10px 0px 0px 20px;
+}
+
+.input-with-select {
+  background-color: #fff;
+}
+</style>
diff --git a/wms_pro/qd/src/views/wms/sync_manage/field_mapping/fieldMapping.js b/wms_pro/qd/src/views/wms/sync_manage/field_mapping/fieldMapping.js
index 1b6a6d62..00ce4163 100644
--- a/wms_pro/qd/src/views/wms/sync_manage/field_mapping/fieldMapping.js
+++ b/wms_pro/qd/src/views/wms/sync_manage/field_mapping/fieldMapping.js
@@ -31,6 +31,13 @@ export function getTableColumnNames(params) {
   })
 }
 
+export function getTableColumnNamesdata(params) {
+  return request({
+    url: 'api/externalFieldMapping/getTableColumnNamesdata/' + params,
+    method: 'get'
+  })
+}
+
 export function getAllTableName() {
   return request({
     url: 'api/externalFieldMapping/getAllTableName',
@@ -68,6 +75,20 @@ export function updateRows(data) {
   })
 }
 
+export function tableColumns(params) {
+  return request({
+    url: '/api/bmFormStruc/tableColumns/' + params,
+    method: 'get'
+  })
+}
+export function syncAnalyse(data) {
+  return request({
+    url: 'api/externalFieldMapping/syncAnalyse',
+    method: 'post',
+    data
+  })
+}
+
 export default {
   add,
   edit,
@@ -75,7 +96,10 @@ export default {
   addRows,
   updateRows,
   getAllTableName,
+  tableColumns,
   getTableColumnNames,
   getExistTableName,
-  getTableColumnNamesFromMapping
+  getTableColumnNamesFromMapping,
+  syncAnalyse,
+  getTableColumnNamesdata
 }
diff --git a/wms_pro/qd/src/views/wms/sync_manage/field_mapping/index.vue b/wms_pro/qd/src/views/wms/sync_manage/field_mapping/index.vue
index ec801f05..230df062 100644
--- a/wms_pro/qd/src/views/wms/sync_manage/field_mapping/index.vue
+++ b/wms_pro/qd/src/views/wms/sync_manage/field_mapping/index.vue
@@ -117,6 +117,38 @@
           <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
         </div>
       </el-dialog>
+      <el-dialog
+        :close-on-click-modal="false"
+        title="表单同步测试"
+        :visible.sync="syncShow"
+        width="800px"
+        @close="syncAnalyseCannel"
+      >
+        <el-form ref="form" :model="syncForm" :rules="rules" size="mini" label-width="50px">
+          <el-form-item label="表单:" prop="occupystruct_qty">
+            <el-input v-model="syncForm.local_table_name" disabled :precision="0" style="width: 150px;" />
+          </el-form-item>
+          <el-form-item label="测试数据" prop="analyseData">
+            <el-input v-model="syncForm.analyseData" type="textarea" :precision="0" style="width: 650px;" />
+          </el-form-item> </el-form>
+        <el-table
+          v-if="AAA"
+          ref="table1"
+          v-loading="crud.loading"
+          :data="receivedData"
+          size="mini"
+          style="width: 100%;"
+          @selection-change="crud.selectionChangeHandler"
+        >
+
+          <el-table-column v-for="(item, index) in dataList" :key="item.COLUMN_NAME" :label="item.COLUMN_COMMENT" width="160">
+            <template slot-scope="scope">{{ scope.row[item.COLUMN_NAME] }}</template>
+          </el-table-column>
+        </el-table>
+        <div slot="footer" class="dialog-footer">
+          <el-button :loading="crud.cu === 2" type="primary" @click="syncAnalyseSubmit">同步解析</el-button>
+        </div>
+      </el-dialog>
       <!--表格渲染-->
       <el-table
         ref="table"
@@ -139,6 +171,7 @@
             {{ dict.label.external_system[scope.row.external_system] }}
           </template>
         </el-table-column>
+
         <el-table-column prop="mapping_json" label="映射关系" show-overflow-tooltip />
         <el-table-column prop="last_update_name" label="更新人" />
         <el-table-column prop="last_update_time" label="更新时间" width="150" />
@@ -148,6 +181,14 @@
               :data="scope.row"
               :permission="permission"
             />
+            <el-button
+              slot="right"
+              class="filter-item"
+              icon="el-icon-download"
+              size="mini"
+              type="text"
+              @click="syncTest(scope.row)"
+            >同步测试</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -168,6 +209,7 @@ import udOperation from '@crud/UD.operation.vue'
 import pagination from '@crud/Pagination.vue'
 import AddDialog from './AddDialog'
 import EditDialog from './EditDialog'
+import fieldMapping from './fieldMapping'
 
 const defaultForm = {
   id: null,
@@ -203,15 +245,21 @@ export default {
     return {
       tableNameList: [],
       fieldNameList: [],
+      dataList: [],
       dataTypeList: [],
+      syncForm: {},
       addShow: false,
       editShow: false,
       permission: {},
+      receivedData: [],
+      AAA: false,
+
       rules: {
         position_code: [
           { required: true, message: '缓存线位置编码不能为空', trigger: 'blur' }
         ]
-      }
+      },
+      syncShow: false
     }
   },
   created() {
@@ -241,11 +289,42 @@ export default {
       this.$refs.editRef.setForm(row)
       this.editShow = true
     },
+    syncTest(row) {
+      this.syncShow = true
+      this.syncForm = row
+      fieldMapping.getTableColumnNamesFromMapping(row.local_table_name).then(res => {
+        this.viewMstCols = res.item
+        if (res.dtl_item != null) {
+          this.hasDtl = true
+          this.viewDtlCols = res.dtl_item
+        }
+      })
+    },
+    syncAnalyseSubmit() {
+      this.AAA = true
+      console.log(this.syncForm)
+      crudFieldMapping.getTableColumnNamesdata(this.syncForm.local_table_name).then(res => {
+        this.dataList = res
+        console.log(this.dataList)
+      })
+      fieldMapping.syncAnalyse(this.syncForm).then(res => {
+        this.crud.notify('解析成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.receivedData = res
+      })
+    },
     querytable() {
       this.crud.toQuery()
     },
     querytable1() {
       this.crud.toQuery()
+    },
+    syncAnalyseCannel() {
+      this.syncForm = {}
+      this.viewMst = [],
+      this.viewDtl = [],
+      this.hasDtl = false,
+      this.viewMstCols = {},
+      this.viewDtlCols = {}
     }
   }
 }