diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/LocalCache.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/LocalCache.java
index fd86fd35..2cf1c1d8 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/LocalCache.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/LocalCache.java
@@ -1,10 +1,9 @@
 package org.nl.common.utils;
 
-import com.alibaba.fastjson.JSONArray;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.wms.pda.dto.MaterialDto;
+import org.nl.wms.pda_manage.pda.dto.MaterialDto;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/start/Init.java b/mes/hd/nladmin-system/src/main/java/org/nl/start/Init.java
index 4694a2b3..19e73d01 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/start/Init.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/start/Init.java
@@ -31,7 +31,7 @@ public class Init implements ApplicationRunner {
 
     private void init() throws Exception {
         //初始化WQL
-        initWql();
+//        initWql();
         //随线程启动
 //        initApplicationAutoInitialExecuter();
 //        initWebAutoInitialExecuter();
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_analysis/bigScreen.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/big_screen/bigScreen.xls
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/system_analysis/bigScreen.xls
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/big_screen/bigScreen.xls
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_analysis/ds_agv.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/big_screen/ds_agv.xls
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/system_analysis/ds_agv.xls
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/big_screen/ds_agv.xls
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
index 3995fc97..1ca55147 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
@@ -17,7 +17,7 @@ import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.wms.ext.acs.service.AcsToWmsService;
-import org.nl.wms.pda.service.CacheLineHandService;
+import org.nl.wms.pda_manage.pda.service.CacheLineHandService;
 import org.nl.wms.product_manage.sch.manage.AbstractAcsTask;
 import org.nl.wms.product_manage.sch.service.TaskService;
 import org.nl.wms.product_manage.sch.service.dto.TaskDto;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/impl/MaterialbaseServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/impl/MaterialbaseServiceImpl.java
index 1aee88e2..b0e66f0c 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/impl/MaterialbaseServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/impl/MaterialbaseServiceImpl.java
@@ -22,7 +22,7 @@ import org.nl.wms.masterdata_manage.master.constant.MaterOptTypeEnum;
 import org.nl.wms.masterdata_manage.master.service.ClassstandardService;
 import org.nl.wms.masterdata_manage.master.service.MaterialbaseService;
 import org.nl.wms.masterdata_manage.master.service.dto.MaterialbaseDto;
-import org.nl.wms.pda.dto.MaterialDto;
+import org.nl.wms.pda_manage.pda.dto.MaterialDto;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/dto/CachelineVehileMaterialDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/dto/CachelineVehileMaterialDto.java
similarity index 92%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/dto/CachelineVehileMaterialDto.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/dto/CachelineVehileMaterialDto.java
index b5dc1345..16dd20b5 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/dto/CachelineVehileMaterialDto.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/dto/CachelineVehileMaterialDto.java
@@ -1,4 +1,4 @@
-package org.nl.wms.pda.dto;
+package org.nl.wms.pda_manage.pda.dto;
 
 import lombok.Data;
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/dto/MaterialDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/dto/MaterialDto.java
similarity index 93%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/dto/MaterialDto.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/dto/MaterialDto.java
index 23a258cd..ec8bba83 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/dto/MaterialDto.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/dto/MaterialDto.java
@@ -1,4 +1,4 @@
-package org.nl.wms.pda.dto;
+package org.nl.wms.pda_manage.pda.dto;
 
 import lombok.Data;
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/rest/CacheLineHandController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/rest/CacheLineHandController.java
similarity index 99%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/rest/CacheLineHandController.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/rest/CacheLineHandController.java
index cca7b349..272b3093 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/rest/CacheLineHandController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/rest/CacheLineHandController.java
@@ -1,4 +1,4 @@
-package org.nl.wms.pda.rest;
+package org.nl.wms.pda_manage.pda.rest;
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import com.alibaba.fastjson.JSONArray;
@@ -11,8 +11,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.nl.common.anno.Log;
 import org.nl.common.utils.api.ResultCode;
 import org.nl.modules.common.exception.BizCoreException;
-import org.nl.wms.pda.dto.MaterialDto;
-import org.nl.wms.pda.service.CacheLineHandService;
+import org.nl.wms.pda_manage.pda.dto.MaterialDto;
+import org.nl.wms.pda_manage.pda.service.CacheLineHandService;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/rest/PdaProductIosController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/rest/PdaProductIosController.java
similarity index 96%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/rest/PdaProductIosController.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/rest/PdaProductIosController.java
index ee207b82..1e963a32 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/rest/PdaProductIosController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/rest/PdaProductIosController.java
@@ -1,4 +1,4 @@
-package org.nl.wms.pda.rest;
+package org.nl.wms.pda_manage.pda.rest;
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import cn.hutool.core.lang.Assert;
@@ -13,7 +13,7 @@ import org.nl.common.anno.Log;
 import org.nl.common.utils.MapOf;
 import org.nl.wms.masterdata_manage.st.service.SectattrService;
 import org.nl.wms.masterdata_manage.st.service.StructivtService;
-import org.nl.wms.pcs.service.SaleOrderService;
+import org.nl.wms.procure_manage.备份pcs.service.SaleOrderService;
 import org.nl.wms.product_manage.sch.service.PointService;
 import org.nl.wms.storage_manage.service.product.ProductInService;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/service/CacheLineHandService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/service/CacheLineHandService.java
similarity index 98%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/service/CacheLineHandService.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/service/CacheLineHandService.java
index 4a42b4ce..b85e9c1a 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/service/CacheLineHandService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/service/CacheLineHandService.java
@@ -1,9 +1,9 @@
-package org.nl.wms.pda.service;
+package org.nl.wms.pda_manage.pda.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import org.nl.common.utils.api.CommonResult;
-import org.nl.wms.pda.dto.MaterialDto;
+import org.nl.wms.pda_manage.pda.dto.MaterialDto;
 import org.springframework.data.domain.Pageable;
 import java.util.List;
 import java.util.Map;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/CacheLineHandServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/service/impl/CacheLineHandServiceImpl.java
similarity index 99%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/CacheLineHandServiceImpl.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/service/impl/CacheLineHandServiceImpl.java
index f494038e..79c84915 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/CacheLineHandServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/service/impl/CacheLineHandServiceImpl.java
@@ -1,4 +1,4 @@
-package org.nl.wms.pda.service.impl;
+package org.nl.wms.pda_manage.pda.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
@@ -23,8 +23,8 @@ import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
 import org.nl.wms.ext.acs.service.WmsToAcsService;
-import org.nl.wms.pda.dto.MaterialDto;
-import org.nl.wms.pda.service.CacheLineHandService;
+import org.nl.wms.pda_manage.pda.dto.MaterialDto;
+import org.nl.wms.pda_manage.pda.service.CacheLineHandService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.scheduling.annotation.Async;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/wql/PDA_QUERY.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/wql/PDA_QUERY.wql
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/wql/PDA_QUERY.wql
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/wql/PDA_QUERY.wql
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/1.txt b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/1.txt
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/1.txt
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/1.txt
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/rest/DeliveryOrderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/rest/DeliveryOrderController.java
similarity index 91%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/rest/DeliveryOrderController.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/rest/DeliveryOrderController.java
index 778c8016..d80507cb 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/rest/DeliveryOrderController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/rest/DeliveryOrderController.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.pcs.rest;
+package org.nl.wms.procure_manage.备份pcs.rest;
 
 
 import io.swagger.annotations.Api;
@@ -7,8 +7,8 @@ import io.swagger.annotations.ApiOperation;
  import lombok.RequiredArgsConstructor;
 import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.wms.pcs.service.DeliveryOrderService;
-import org.nl.wms.pcs.service.dto.DeliveryOrderDto;
+import org.nl.wms.procure_manage.备份pcs.service.DeliveryOrderService;
+import org.nl.wms.procure_manage.备份pcs.service.dto.DeliveryOrderDto;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/rest/SaleOrderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/rest/SaleOrderController.java
similarity index 91%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/rest/SaleOrderController.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/rest/SaleOrderController.java
index 971fe24b..dae11327 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/rest/SaleOrderController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/rest/SaleOrderController.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.pcs.rest;
+package org.nl.wms.procure_manage.备份pcs.rest;
 
 
 import io.swagger.annotations.Api;
@@ -7,8 +7,8 @@ import io.swagger.annotations.ApiOperation;
  import lombok.RequiredArgsConstructor;
 import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.wms.pcs.service.SaleOrderService;
-import org.nl.wms.pcs.service.dto.SaleOrderDto;
+import org.nl.wms.procure_manage.备份pcs.service.SaleOrderService;
+import org.nl.wms.procure_manage.备份pcs.service.dto.SaleOrderDto;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/DeliveryOrderService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/DeliveryOrderService.java
similarity index 89%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/DeliveryOrderService.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/DeliveryOrderService.java
index d3397152..7d4a41e5 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/DeliveryOrderService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/DeliveryOrderService.java
@@ -1,7 +1,7 @@
 
-package org.nl.wms.pcs.service;
+package org.nl.wms.procure_manage.备份pcs.service;
 
-import org.nl.wms.pcs.service.dto.DeliveryOrderDto;
+import org.nl.wms.procure_manage.备份pcs.service.dto.DeliveryOrderDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/SaleOrderService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/SaleOrderService.java
similarity index 89%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/SaleOrderService.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/SaleOrderService.java
index 5dbf55ea..f81c9e03 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/SaleOrderService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/SaleOrderService.java
@@ -1,7 +1,7 @@
 
-package org.nl.wms.pcs.service;
+package org.nl.wms.procure_manage.备份pcs.service;
 
-import org.nl.wms.pcs.service.dto.SaleOrderDto;
+import org.nl.wms.procure_manage.备份pcs.service.dto.SaleOrderDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/dto/DeliveryOrderDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/dto/DeliveryOrderDto.java
similarity index 95%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/dto/DeliveryOrderDto.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/dto/DeliveryOrderDto.java
index b94933db..990b8e45 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/dto/DeliveryOrderDto.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/dto/DeliveryOrderDto.java
@@ -1,14 +1,12 @@
-package org.nl.wms.pcs.service.dto;
+package org.nl.wms.procure_manage.备份pcs.service.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
-import java.util.Date;
 
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
 * @description /
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/dto/SaleOrderDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/dto/SaleOrderDto.java
similarity index 95%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/dto/SaleOrderDto.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/dto/SaleOrderDto.java
index 5cc11b8d..5d784206 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/dto/SaleOrderDto.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/dto/SaleOrderDto.java
@@ -1,14 +1,12 @@
-package org.nl.wms.pcs.service.dto;
+package org.nl.wms.procure_manage.备份pcs.service.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
-import java.util.Date;
 
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
 * @description /
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/DeliveryOrderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/impl/DeliveryOrderServiceImpl.java
similarity index 96%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/DeliveryOrderServiceImpl.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/impl/DeliveryOrderServiceImpl.java
index 39fdc879..f8cdb2cb 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/DeliveryOrderServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/impl/DeliveryOrderServiceImpl.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.pcs.service.impl;
+package org.nl.wms.procure_manage.备份pcs.service.impl;
 
 
 import cn.hutool.core.date.DateUtil;
@@ -19,8 +19,8 @@ import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
 import org.nl.wms.masterdata_manage.master.service.ClassstandardService;
-import org.nl.wms.pcs.service.DeliveryOrderService;
-import org.nl.wms.pcs.service.dto.DeliveryOrderDto;
+import org.nl.wms.procure_manage.备份pcs.service.DeliveryOrderService;
+import org.nl.wms.procure_manage.备份pcs.service.dto.DeliveryOrderDto;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/SaleOrderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/impl/SaleOrderServiceImpl.java
similarity index 96%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/SaleOrderServiceImpl.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/impl/SaleOrderServiceImpl.java
index 7a2e2947..bcad19b0 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/SaleOrderServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/impl/SaleOrderServiceImpl.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.pcs.service.impl;
+package org.nl.wms.procure_manage.备份pcs.service.impl;
 
 
 import cn.hutool.core.date.DateUtil;
@@ -19,8 +19,8 @@ import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
 import org.nl.wms.masterdata_manage.master.service.ClassstandardService;
-import org.nl.wms.pcs.service.SaleOrderService;
-import org.nl.wms.pcs.service.dto.SaleOrderDto;
+import org.nl.wms.procure_manage.备份pcs.service.SaleOrderService;
+import org.nl.wms.procure_manage.备份pcs.service.dto.SaleOrderDto;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/PCS_DELIVERYORDER001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/wql/PCS_DELIVERYORDER001.wql
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/PCS_DELIVERYORDER001.wql
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/wql/PCS_DELIVERYORDER001.wql
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/PCS_SALEORDER001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/wql/PCS_SALEORDER001.wql
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/PCS_SALEORDER001.wql
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/wql/PCS_SALEORDER001.wql
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/pcs.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/wql/pcs.xls
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/wql/pcs.xls
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/wql/pcs.xls
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/pdm.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/pdm.xls
index 2d1f6ff9..da641ef1 100644
Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/pdm.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/pdm.xls differ
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/WashMachineryTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/WashMachineryTask.java
index 5b49d54e..08c3e835 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/WashMachineryTask.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/WashMachineryTask.java
@@ -17,8 +17,8 @@ import org.nl.common.utils.MapOf;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.wms.ext.acs.service.WmsToAcsService;
-import org.nl.wms.pdm.IPdmProduceWashorderService;
-import org.nl.wms.pdm.dao.PdmProduceWashorder;
+import org.nl.wms.product_manage.备份pdm.IPdmProduceWashorderService;
+import org.nl.wms.product_manage.备份pdm.dao.PdmProduceWashorder;
 import org.nl.wms.product_manage.sch.manage.AbstractAcsTask;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.FileSystemResourceLoader;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/IPdmProduceWashorderService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/IPdmProduceWashorderService.java
similarity index 68%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/IPdmProduceWashorderService.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/IPdmProduceWashorderService.java
index f728fc1c..b193c8ec 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/IPdmProduceWashorderService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/IPdmProduceWashorderService.java
@@ -1,8 +1,8 @@
-package org.nl.wms.pdm;
+package org.nl.wms.product_manage.备份pdm;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.nl.wms.pdm.dao.PdmProduceWashorder;
+import org.nl.wms.product_manage.备份pdm.dao.PdmProduceWashorder;
 
 /**
  * <p>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/dao/PdmProduceWashorder.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/dao/PdmProduceWashorder.java
similarity index 97%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/dao/PdmProduceWashorder.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/dao/PdmProduceWashorder.java
index 69aeadab..c8c6693d 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/dao/PdmProduceWashorder.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/dao/PdmProduceWashorder.java
@@ -1,4 +1,4 @@
-package org.nl.wms.pdm.dao;
+package org.nl.wms.product_manage.备份pdm.dao;
 
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/dao/mapper/PdmProduceWashorderMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/dao/mapper/PdmProduceWashorderMapper.java
similarity index 66%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/dao/mapper/PdmProduceWashorderMapper.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/dao/mapper/PdmProduceWashorderMapper.java
index 061cad2f..ba145149 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/dao/mapper/PdmProduceWashorderMapper.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/dao/mapper/PdmProduceWashorderMapper.java
@@ -1,8 +1,8 @@
-package org.nl.wms.pdm.dao.mapper;
+package org.nl.wms.product_manage.备份pdm.dao.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.nl.wms.pdm.dao.PdmProduceWashorder;
+import org.nl.wms.product_manage.备份pdm.dao.PdmProduceWashorder;
 
 /**
  * <p>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/dao/mapper/PdmProduceWashorderMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/dao/mapper/PdmProduceWashorderMapper.xml
similarity index 62%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/dao/mapper/PdmProduceWashorderMapper.xml
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/dao/mapper/PdmProduceWashorderMapper.xml
index bdca6cc0..acf77106 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/dao/mapper/PdmProduceWashorderMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/dao/mapper/PdmProduceWashorderMapper.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.pdm.dao.mapper.PdmProduceWashorderMapper">
+<mapper namespace="org.nl.wms.product_manage.备份pdm.dao.mapper.PdmProduceWashorderMapper">
 
 </mapper>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/impl/PdmProduceWashorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/impl/PdmProduceWashorderServiceImpl.java
similarity index 58%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/impl/PdmProduceWashorderServiceImpl.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/impl/PdmProduceWashorderServiceImpl.java
index ca209e65..94d6fa11 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/impl/PdmProduceWashorderServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/impl/PdmProduceWashorderServiceImpl.java
@@ -1,10 +1,10 @@
-package org.nl.wms.pdm.impl;
+package org.nl.wms.product_manage.备份pdm.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.nl.wms.pdm.IPdmProduceWashorderService;
-import org.nl.wms.pdm.dao.PdmProduceWashorder;
-import org.nl.wms.pdm.dao.mapper.PdmProduceWashorderMapper;
+import org.nl.wms.product_manage.备份pdm.IPdmProduceWashorderService;
+import org.nl.wms.product_manage.备份pdm.dao.PdmProduceWashorder;
+import org.nl.wms.product_manage.备份pdm.dao.mapper.PdmProduceWashorderMapper;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/BomController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/BomController.java
similarity index 97%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/BomController.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/BomController.java
index 560d3bcc..43170c39 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/BomController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/BomController.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.pdm.rest;
+package org.nl.wms.product_manage.备份pdm.rest;
 
 
 import com.alibaba.fastjson.JSONObject;
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiOperation;
  import lombok.RequiredArgsConstructor;
 import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.wms.pdm.service.BomService;
+import org.nl.wms.product_manage.备份pdm.service.BomService;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/DeviceController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/DeviceController.java
similarity index 93%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/DeviceController.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/DeviceController.java
index c327759e..cd028e6f 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/DeviceController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/DeviceController.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.pdm.rest;
+package org.nl.wms.product_manage.备份pdm.rest;
 
 
 import io.swagger.annotations.Api;
@@ -7,8 +7,8 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.anno.Log;
-import org.nl.wms.pdm.service.DeviceService;
-import org.nl.wms.pdm.service.dto.DeviceDto;
+import org.nl.wms.product_manage.备份pdm.service.DeviceService;
+import org.nl.wms.product_manage.备份pdm.service.dto.DeviceDto;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/DeviceitemController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/DeviceitemController.java
similarity index 91%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/DeviceitemController.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/DeviceitemController.java
index 0efb98bd..96e92caa 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/DeviceitemController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/DeviceitemController.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.pdm.rest;
+package org.nl.wms.product_manage.备份pdm.rest;
 
 
 import io.swagger.annotations.Api;
@@ -7,8 +7,8 @@ import io.swagger.annotations.ApiOperation;
  import lombok.RequiredArgsConstructor;
 import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.wms.pdm.service.DeviceitemService;
-import org.nl.wms.pdm.service.dto.DeviceitemDto;
+import org.nl.wms.product_manage.备份pdm.service.DeviceitemService;
+import org.nl.wms.product_manage.备份pdm.service.dto.DeviceitemDto;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/FactoryCalendarController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/FactoryCalendarController.java
similarity index 96%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/FactoryCalendarController.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/FactoryCalendarController.java
index 14d231af..74d9d601 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/FactoryCalendarController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/FactoryCalendarController.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.pdm.rest;
+package org.nl.wms.product_manage.备份pdm.rest;
 
 
 import com.alibaba.fastjson.JSONObject;
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiOperation;
  import lombok.RequiredArgsConstructor;
 import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.wms.pdm.service.FactoryCalendarService;
+import org.nl.wms.product_manage.备份pdm.service.FactoryCalendarService;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/ProcessrouteController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/ProcessrouteController.java
similarity index 96%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/ProcessrouteController.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/ProcessrouteController.java
index de31ec73..09905c69 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/ProcessrouteController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/ProcessrouteController.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.pdm.rest;
+package org.nl.wms.product_manage.备份pdm.rest;
 
 
 import com.alibaba.fastjson.JSONObject;
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiOperation;
  import lombok.RequiredArgsConstructor;
 import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.wms.pdm.service.ProcessrouteService;
+import org.nl.wms.product_manage.备份pdm.service.ProcessrouteService;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/ProductprocessrouteController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/ProductprocessrouteController.java
similarity index 96%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/ProductprocessrouteController.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/ProductprocessrouteController.java
index ad7a11bc..6e737c1e 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/ProductprocessrouteController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/ProductprocessrouteController.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.pdm.rest;
+package org.nl.wms.product_manage.备份pdm.rest;
 
 
 import com.alibaba.fastjson.JSONObject;
@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiOperation;
  import lombok.RequiredArgsConstructor;
 import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.wms.pdm.service.ProductprocessrouteService;
+import org.nl.wms.product_manage.备份pdm.service.ProductprocessrouteService;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/BomService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/BomService.java
similarity index 92%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/BomService.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/BomService.java
index 1bb04f54..b4c241fb 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/BomService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/BomService.java
@@ -1,9 +1,9 @@
 
-package org.nl.wms.pdm.service;
+package org.nl.wms.product_manage.备份pdm.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import org.nl.wms.pdm.service.dto.BomDto;
+import org.nl.wms.product_manage.备份pdm.service.dto.BomDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/DeviceService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/DeviceService.java
similarity index 88%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/DeviceService.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/DeviceService.java
index 27e94ca8..9bccb5c2 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/DeviceService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/DeviceService.java
@@ -1,13 +1,11 @@
 
-package org.nl.wms.pdm.service;
+package org.nl.wms.product_manage.备份pdm.service;
 
 import com.alibaba.fastjson.JSONArray;
-import org.nl.wms.pdm.service.dto.DeviceDto;
+import org.nl.wms.product_manage.备份pdm.service.dto.DeviceDto;
 import org.springframework.data.domain.Pageable;
 import java.util.Map;
 import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
 
 /**
  * @description 服务接口
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/DeviceitemService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/DeviceitemService.java
similarity index 89%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/DeviceitemService.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/DeviceitemService.java
index 158aa116..d90516ef 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/DeviceitemService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/DeviceitemService.java
@@ -1,7 +1,7 @@
 
-package org.nl.wms.pdm.service;
+package org.nl.wms.product_manage.备份pdm.service;
 
-import org.nl.wms.pdm.service.dto.DeviceitemDto;
+import org.nl.wms.product_manage.备份pdm.service.dto.DeviceitemDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/FactoryCalendarService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/FactoryCalendarService.java
similarity index 94%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/FactoryCalendarService.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/FactoryCalendarService.java
index d4597572..f1190205 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/FactoryCalendarService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/FactoryCalendarService.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.pdm.service;
+package org.nl.wms.product_manage.备份pdm.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/ProcessrouteService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/ProcessrouteService.java
similarity index 93%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/ProcessrouteService.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/ProcessrouteService.java
index b55844fb..3b26737a 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/ProcessrouteService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/ProcessrouteService.java
@@ -1,10 +1,10 @@
 
-package org.nl.wms.pdm.service;
+package org.nl.wms.product_manage.备份pdm.service;
 
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import org.nl.wms.pdm.service.dto.ProcessrouteDto;
+import org.nl.wms.product_manage.备份pdm.service.dto.ProcessrouteDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/ProductprocessrouteService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/ProductprocessrouteService.java
similarity index 91%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/ProductprocessrouteService.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/ProductprocessrouteService.java
index 8c490b3a..e63b1ba6 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/ProductprocessrouteService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/ProductprocessrouteService.java
@@ -1,9 +1,9 @@
 
-package org.nl.wms.pdm.service;
+package org.nl.wms.product_manage.备份pdm.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import org.nl.wms.pdm.service.dto.ProductprocessrouteDto;
+import org.nl.wms.product_manage.备份pdm.service.dto.ProductprocessrouteDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/BomDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/dto/BomDto.java
similarity index 95%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/BomDto.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/dto/BomDto.java
index 4a901b37..aee66c63 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/BomDto.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/dto/BomDto.java
@@ -1,7 +1,6 @@
-package org.nl.wms.pdm.service.dto;
+package org.nl.wms.product_manage.备份pdm.service.dto;
 
 import lombok.Data;
-import java.util.Date;
 
 
 import java.io.Serializable;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/DeviceDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/dto/DeviceDto.java
similarity index 96%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/DeviceDto.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/dto/DeviceDto.java
index 44c9f27c..eb4c3c4b 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/DeviceDto.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/dto/DeviceDto.java
@@ -1,4 +1,4 @@
-package org.nl.wms.pdm.service.dto;
+package org.nl.wms.product_manage.备份pdm.service.dto;
 
 import lombok.Data;
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/DeviceitemDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/dto/DeviceitemDto.java
similarity index 93%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/DeviceitemDto.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/dto/DeviceitemDto.java
index f87214df..40e10c19 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/DeviceitemDto.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/dto/DeviceitemDto.java
@@ -1,9 +1,8 @@
-package org.nl.wms.pdm.service.dto;
+package org.nl.wms.product_manage.备份pdm.service.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
-import java.util.Date;
 
 
 import java.io.Serializable;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/ProcessrouteDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/dto/ProcessrouteDto.java
similarity index 95%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/ProcessrouteDto.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/dto/ProcessrouteDto.java
index 45817846..b1da83f4 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/ProcessrouteDto.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/dto/ProcessrouteDto.java
@@ -1,14 +1,12 @@
-package org.nl.wms.pdm.service.dto;
+package org.nl.wms.product_manage.备份pdm.service.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
-import java.util.Date;
 
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
 * @description /
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/ProductprocessrouteDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/dto/ProductprocessrouteDto.java
similarity index 95%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/ProductprocessrouteDto.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/dto/ProductprocessrouteDto.java
index c81e3990..e3cd2c2f 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/ProductprocessrouteDto.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/dto/ProductprocessrouteDto.java
@@ -1,14 +1,12 @@
-package org.nl.wms.pdm.service.dto;
+package org.nl.wms.product_manage.备份pdm.service.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
-import java.util.Date;
 
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
 * @description /
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/BomServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/BomServiceImpl.java
similarity index 98%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/BomServiceImpl.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/BomServiceImpl.java
index f84c7555..8cd30c24 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/BomServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/BomServiceImpl.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.pdm.service.impl;
+package org.nl.wms.product_manage.备份pdm.service.impl;
 
 
 import cn.hutool.core.date.DateUtil;
@@ -10,15 +10,14 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
  import lombok.RequiredArgsConstructor;
-import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.modules.common.exception.BadRequestException;
  import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
-import org.nl.wms.pdm.service.BomService;
-import org.nl.wms.pdm.service.dto.BomDto;
+import org.nl.wms.product_manage.备份pdm.service.BomService;
+import org.nl.wms.product_manage.备份pdm.service.dto.BomDto;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/DeviceServiceImpl.java
similarity index 95%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/DeviceServiceImpl.java
index 505c8f59..a3113dd4 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/DeviceServiceImpl.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.pdm.service.impl;
+package org.nl.wms.product_manage.备份pdm.service.impl;
 
 
 import cn.hutool.core.date.DateUtil;
@@ -12,11 +12,10 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.WQL;
-import org.nl.modules.wql.core.bean.ResultBean;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
-import org.nl.wms.pdm.service.DeviceService;
-import org.nl.wms.pdm.service.dto.DeviceDto;
+import org.nl.wms.product_manage.备份pdm.service.DeviceService;
+import org.nl.wms.product_manage.备份pdm.service.dto.DeviceDto;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceitemServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/DeviceitemServiceImpl.java
similarity index 95%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceitemServiceImpl.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/DeviceitemServiceImpl.java
index 1f569656..f1a800a0 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceitemServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/DeviceitemServiceImpl.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.pdm.service.impl;
+package org.nl.wms.product_manage.备份pdm.service.impl;
 
 
 import cn.hutool.core.map.MapUtil;
@@ -10,14 +10,13 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
  import lombok.RequiredArgsConstructor;
-import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.core.bean.ResultBean;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
-import org.nl.wms.pdm.service.DeviceitemService;
-import org.nl.wms.pdm.service.dto.DeviceitemDto;
+import org.nl.wms.product_manage.备份pdm.service.DeviceitemService;
+import org.nl.wms.product_manage.备份pdm.service.dto.DeviceitemDto;
 
 
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/FactoryCalendarServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/FactoryCalendarServiceImpl.java
similarity index 98%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/FactoryCalendarServiceImpl.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/FactoryCalendarServiceImpl.java
index 1e641398..041cf151 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/FactoryCalendarServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/FactoryCalendarServiceImpl.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.pdm.service.impl;
+package org.nl.wms.product_manage.备份pdm.service.impl;
 
 
 import cn.hutool.core.date.DateUtil;
@@ -17,7 +17,7 @@ import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
-import org.nl.wms.pdm.service.FactoryCalendarService;
+import org.nl.wms.product_manage.备份pdm.service.FactoryCalendarService;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProcessrouteServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/ProcessrouteServiceImpl.java
similarity index 98%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProcessrouteServiceImpl.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/ProcessrouteServiceImpl.java
index 2933e22e..ff0ab0a9 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProcessrouteServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/ProcessrouteServiceImpl.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.pdm.service.impl;
+package org.nl.wms.product_manage.备份pdm.service.impl;
 
 
 import cn.hutool.core.date.DateUtil;
@@ -17,8 +17,8 @@ import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
-import org.nl.wms.pdm.service.ProcessrouteService;
-import org.nl.wms.pdm.service.dto.ProcessrouteDto;
+import org.nl.wms.product_manage.备份pdm.service.ProcessrouteService;
+import org.nl.wms.product_manage.备份pdm.service.dto.ProcessrouteDto;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProductprocessrouteServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/ProductprocessrouteServiceImpl.java
similarity index 98%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProductprocessrouteServiceImpl.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/ProductprocessrouteServiceImpl.java
index 1fdebf6b..6199d79e 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProductprocessrouteServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/ProductprocessrouteServiceImpl.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.pdm.service.impl;
+package org.nl.wms.product_manage.备份pdm.service.impl;
 
 
 import cn.hutool.core.date.DateUtil;
@@ -18,8 +18,8 @@ import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
-import org.nl.wms.pdm.service.ProductprocessrouteService;
-import org.nl.wms.pdm.service.dto.ProductprocessrouteDto;
+import org.nl.wms.product_manage.备份pdm.service.ProductprocessrouteService;
+import org.nl.wms.product_manage.备份pdm.service.dto.ProductprocessrouteDto;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_BOM01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/wql/PDM_BI_BOM01.wql
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_BOM01.wql
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/wql/PDM_BI_BOM01.wql
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_DEVICE01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/wql/PDM_BI_DEVICE01.wql
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_DEVICE01.wql
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/wql/PDM_BI_DEVICE01.wql
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_BI_PRODUCTROUTE01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/wql/QPDM_BI_PRODUCTROUTE01.wql
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_BI_PRODUCTROUTE01.wql
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/wql/QPDM_BI_PRODUCTROUTE01.wql
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_FACTORYCALENDAR.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/wql/QPDM_FACTORYCALENDAR.wql
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_FACTORYCALENDAR.wql
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/wql/QPDM_FACTORYCALENDAR.wql
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QP_BI_PROCESSROUTE01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/wql/QP_BI_PROCESSROUTE01.wql
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QP_BI_PROCESSROUTE01.wql
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/wql/QP_BI_PROCESSROUTE01.wql
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QUERY_DEVICE.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/wql/QUERY_DEVICE.wql
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QUERY_DEVICE.wql
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/wql/QUERY_DEVICE.wql
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/wql/pdm.xls
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/wql/pdm.xls
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/controller/inspection/MdQinspectionPointController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/controller/inspection/MdQinspectionPointController.java
deleted file mode 100644
index 6ac51a82..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/controller/inspection/MdQinspectionPointController.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.nl.wms.ql.controller.inspection;
-
-
-import cn.hutool.core.lang.Assert;
-import com.alibaba.fastjson.JSONObject;
-import org.nl.common.TableDataInfo;
-import org.nl.common.domain.query.PageQuery;
-import org.nl.common.utils.SecurityUtils;
-import org.nl.wms.ql.service.inspection.IMdQlInspectionpointService;
-import org.nl.wms.ql.service.inspection.dao.MdQlInspectionpoint;
-import org.nl.wms.ql.service.inspection.dto.InspectionQuery;
-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.Date;
-import java.util.List;
-
-/**
- * <p>
- * 物料检测项点 前端控制器
- * </p>
- *
- * @author generator
- * @since 2023-04-23
- */
-@RestController
-@RequestMapping("/api/mdQlInspectionpoint")
-public class MdQinspectionPointController {
-
-    @Autowired
-    private IMdQlInspectionpointService inspectionpointService;
-
-    @GetMapping()
-    public ResponseEntity<Object> query(InspectionQuery query, PageQuery pageQuery){
-        return new ResponseEntity<>(TableDataInfo.build(inspectionpointService.page(query,pageQuery)),HttpStatus.OK);
-    }
-
-    @PostMapping("/create")
-    public ResponseEntity<Object> create(@RequestBody JSONObject req){
-        Assert.notNull(req,"参数不能为空");
-        inspectionpointService.create(req);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-    @PostMapping("/update")
-    public ResponseEntity<Object> update(@RequestBody JSONObject req){
-        Assert.notNull(req,"参数不能为空");
-        MdQlInspectionpoint form = req.toJavaObject(MdQlInspectionpoint.class);
-        form.setUpdateId(SecurityUtils.getCurrentUserId());
-        form.setUpdateName(SecurityUtils.getCurrentNickName());
-        form.setUpdateTime(new Date());
-        inspectionpointService.updateById(form);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-    @PostMapping("/delete")
-    public ResponseEntity<Object> delete(@RequestBody List<String> ids){
-        Assert.notNull(ids,"参数不能为空");
-        inspectionpointService.removeByIds(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-
-}
-
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/controller/inspection/MdQlMaterialinspectionController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/controller/inspection/MdQlMaterialinspectionController.java
deleted file mode 100644
index 2b72dfa2..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/controller/inspection/MdQlMaterialinspectionController.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.nl.wms.ql.controller.inspection;
-
-
-import cn.dev33.satoken.annotation.SaIgnore;
-import cn.hutool.core.lang.Assert;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.google.common.collect.Lists;
-import org.jetbrains.annotations.NotNull;
-import org.nl.common.TableDataInfo;
-import org.nl.common.domain.query.PageQuery;
-import org.nl.common.utils.IdUtil;
-import org.nl.common.utils.SecurityUtils;
-import org.nl.modules.common.exception.BadRequestException;
-import org.nl.modules.wql.util.SpringContextHolder;
-import org.nl.wms.ql.service.inspection.IMdQlInspectionpointService;
-import org.nl.wms.ql.service.inspection.IMdQlMaterialinspectionService;
-import org.nl.wms.ql.service.inspection.dao.MdQlInspectionpoint;
-import org.nl.wms.ql.service.inspection.dao.MdQlMaterialinspection;
-import org.nl.wms.ql.service.inspection.dto.MaterialInspectionQuery;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.TransactionDefinition;
-import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.support.DefaultTransactionDefinition;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-import java.util.function.BiFunction;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 物料检测项点 前端控制器
- * </p>
- *
- * @author generator
- * @since 2023-04-23
- */
-@RestController
-@RequestMapping("/api/materialInspection")
-public class MdQlMaterialinspectionController {
-
-    @Autowired
-    private IMdQlInspectionpointService inspectionpointService;
-    @Autowired
-    private IMdQlMaterialinspectionService materialinspectionService;
-
-
-    @GetMapping("/mst")
-    @SaIgnore
-    public ResponseEntity<Object> query(MaterialInspectionQuery query, PageQuery pageQuery){
-        return new ResponseEntity<>(TableDataInfo.build(materialinspectionService.pageQuery(query,pageQuery)),HttpStatus.OK);
-    }
-
-    @PostMapping("/create")
-    public ResponseEntity<Object> create(@RequestBody JSONObject req){
-        Assert.notNull(req,"参数不能为空");
-        materialinspectionService.create(req);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-    @PostMapping("/update")
-    public ResponseEntity<Object> update(@RequestBody JSONObject req){
-        Assert.notNull(req,"参数不能为空");
-        MdQlMaterialinspection form = req.toJavaObject(MdQlMaterialinspection.class);
-        form.setUpdateId(SecurityUtils.getCurrentUserId());
-        form.setUpdateName(SecurityUtils.getCurrentNickName());
-        form.setUpdateTime(new Date());
-        materialinspectionService.updateById(form);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-    @PostMapping("/delete")
-    public ResponseEntity<Object> delete(@RequestBody List<String> ids){
-        Assert.notNull(ids,"参数不能为空");
-        inspectionpointService.removeByIds(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-}
-
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/controller/report/MdMeInspectionsheetController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/controller/report/MdMeInspectionsheetController.java
deleted file mode 100644
index 5c32a740..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/controller/report/MdMeInspectionsheetController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.nl.wms.ql.controller.report;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 质检报告 前端控制器
- * </p>
- *
- * @author generator
- * @since 2023-04-23
- */
-@RestController
-@RequestMapping("/mdMeInspectionsheet")
-public class MdMeInspectionsheetController {
-
-}
-
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/IMdQlInspectionpointService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/IMdQlInspectionpointService.java
deleted file mode 100644
index 69b1989b..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/IMdQlInspectionpointService.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.nl.wms.ql.service.inspection;
-
-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.query.PageQuery;
-import org.nl.wms.ql.service.inspection.dao.MdQlInspectionpoint;
-import org.nl.wms.ql.service.inspection.dto.InspectionQuery;
-
-/**
- * <p>
- * 检测项点 服务类
- * </p>
- *
- * @author generator
- * @since 2023-04-23
- */
-public interface IMdQlInspectionpointService extends IService<MdQlInspectionpoint> {
-
-    void create(JSONObject form);
-
-    Page page(InspectionQuery query, PageQuery pageQuery);
-
-}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/IMdQlMaterialinspectionService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/IMdQlMaterialinspectionService.java
deleted file mode 100644
index f05295b2..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/IMdQlMaterialinspectionService.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.nl.wms.ql.service.inspection;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.nl.common.TableDataInfo;
-import org.nl.common.domain.query.PageQuery;
-import org.nl.wms.ql.service.inspection.dao.MdQlMaterialinspection;
-import org.nl.wms.ql.service.inspection.dto.MaterialInspectionQuery;
-
-/**
- * <p>
- * 物料检测项点 服务类
- * </p>
- *
- * @author generator
- * @since 2023-04-23
- */
-public interface IMdQlMaterialinspectionService extends IService<MdQlMaterialinspection> {
-    void create(JSONObject form);
-    Page pageQuery(MaterialInspectionQuery query, PageQuery pageQuery);
-}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/dao/MdQlInspectionpoint.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/dao/MdQlInspectionpoint.java
deleted file mode 100644
index fb2c75c2..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/dao/MdQlInspectionpoint.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.nl.wms.ql.service.inspection.dao;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 检测项点
- * </p>
- *
- * @author generator
- * @since 2023-04-23
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("md_ql_inspectionpoint")
-public class MdQlInspectionpoint implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 项目id
-     */
-    @TableId(value = "inspection_id", type = IdType.NONE)
-    private String inspectionId;
-
-    /**
-     * 项目编码
-     */
-    private String inspectionCode;
-
-    /**
-     * 项目名称
-     */
-    private String name;
-
-    /**
-     * 检测类型
-     */
-    private String inspectionType;
-
-    /**
-     * 标准值
-     */
-    private String standard;
-
-    /**
-     * 创建人姓名
-     */
-    private String createName;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-    /**
-     * 创建人
-     */
-    private String createId;
-
-    /**
-     * 修改人
-     */
-    private String updateId;
-
-    /**
-     * 修改人姓名
-     */
-    private String updateName;
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 修改时间
-     */
-    private Date updateTime;
-
-
-}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/dao/MdQlMaterialinspection.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/dao/MdQlMaterialinspection.java
deleted file mode 100644
index 3f146c32..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/dao/MdQlMaterialinspection.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.nl.wms.ql.service.inspection.dao;
-
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 物料检测项点
- * </p>
- *
- * @author generator
- * @since 2023-04-23
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("md_ql_materialinspection")
-public class MdQlMaterialinspection implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 物料id
-     */
-    @TableId(value = "material_code")
-    private String material_code;
-    /**
-     * 检测项名称
-     */
-    private String name;
-
-    /**
-     * 项目集合{"项目编号"："true"/123.000~123.500}
-     */
-    private String inspections;
-
-    /**
-     * 版本号
-     */
-    private String version;
-
-    /**
-     * 创建人
-     */
-    private String createId;
-
-    /**
-     * 创建人姓名
-     */
-    private String createName;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 修改人
-     */
-    private String updateId;
-
-    /**
-     * 修改人姓名
-     */
-    private String updateName;
-
-    /**
-     * 修改时间
-     */
-    private Date updateTime;
-
-    /**
-     * 是否启用
-     */
-    private Boolean isUsed;
-
-
-}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/dao/TypeHandler/InspectionArrayHandler.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/dao/TypeHandler/InspectionArrayHandler.java
deleted file mode 100644
index f3d5af8e..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/dao/TypeHandler/InspectionArrayHandler.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.nl.wms.ql.service.inspection.dao.TypeHandler;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import jdk.nashorn.internal.parser.JSONParser;
-import org.apache.ibatis.type.*;
-import org.nl.wms.ql.service.inspection.dao.MdQlInspectionpoint;
-
-import java.sql.CallableStatement;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.List;
-
-/*
- * @author ZZQ
- * @Date 2023/4/24 09:50
- */
-@MappedJdbcTypes(JdbcType.VARCHAR)
-@MappedTypes(JSONArray.class)
-public class InspectionArrayHandler extends BaseTypeHandler<List<MdQlInspectionpoint>> {
-    @Override
-    public void setNonNullParameter(PreparedStatement ps, int i, List<MdQlInspectionpoint> parameter, JdbcType jdbcType) throws SQLException {
-        ps.setString(i, JSON.toJSONString(parameter));
-    }
-
-    @Override
-    public List<MdQlInspectionpoint> getNullableResult(ResultSet rs, String columnName) throws SQLException {
-        return JSONArray.parseArray(rs.getString(columnName),MdQlInspectionpoint.class);
-    }
-
-    @Override
-    public List<MdQlInspectionpoint> getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
-        return JSONArray.parseArray(rs.getString(columnIndex),MdQlInspectionpoint.class);
-
-    }
-
-    @Override
-    public List<MdQlInspectionpoint> getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
-        return JSONArray.parseArray(cs.getString(columnIndex),MdQlInspectionpoint.class);
-
-    }
-}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/dao/mapper/MdQlInspectionpointMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/dao/mapper/MdQlInspectionpointMapper.java
deleted file mode 100644
index dafea380..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/dao/mapper/MdQlInspectionpointMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.nl.wms.ql.service.inspection.dao.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.nl.wms.ql.service.inspection.dao.MdQlInspectionpoint;
-
-/**
- * <p>
- * 检测项点 Mapper 接口
- * </p>
- *
- * @author generator
- * @since 2023-04-23
- */
-public interface MdQlInspectionpointMapper extends BaseMapper<MdQlInspectionpoint> {
-
-}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/dao/mapper/MdQlMaterialinspectionMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/dao/mapper/MdQlMaterialinspectionMapper.java
deleted file mode 100644
index 4fab6aad..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/dao/mapper/MdQlMaterialinspectionMapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.nl.wms.ql.service.inspection.dao.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import org.nl.wms.ql.service.inspection.dao.MdQlMaterialinspection;
-import org.nl.wms.ql.service.inspection.dto.MaterialInspectionQuery;
-import org.nl.wms.ql.service.inspection.dto.MdQlMaterialinspectionDto;
-
-import java.util.List;
-
-/**
- * <p>
- * 物料检测项点 Mapper 接口
- * </p>
- *
- * @author generator
- * @since 2023-04-23
- */
-public interface MdQlMaterialinspectionMapper extends BaseMapper<MdQlMaterialinspection> {
-
-    List<MdQlMaterialinspectionDto> pageQuery(@Param("query") MaterialInspectionQuery query);
-}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/dao/mapper/MdQlMaterialinspectionMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/dao/mapper/MdQlMaterialinspectionMapper.xml
deleted file mode 100644
index 8cee7ee9..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/dao/mapper/MdQlMaterialinspectionMapper.xml
+++ /dev/null
@@ -1,27 +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.ql.service.inspection.dao.mapper.MdQlMaterialinspectionMapper">
-    <resultMap id="BaseResultMap" type="org.nl.wms.ql.service.inspection.dto.MdQlMaterialinspectionDto" autoMapping="true">
-        <id column="id" jdbcType="BIGINT" property="materialCode" />
-        <result column="inspections" typeHandler="org.nl.wms.ql.service.inspection.dao.TypeHandler.InspectionArrayHandler" property="inspections"></result>
-    </resultMap>
-    <select id="pageQuery" resultMap="BaseResultMap">
-        select
-             `name`
-             ,material_code
-             ,inspections,version
-             ,create_id
-             ,create_name
-             ,create_time
-             ,update_id
-             ,update_name
-             ,update_time
-             ,is_used
-        from md_ql_materialinspection
-        <where>
-            <if test="query.blurry != null and query.blurry != ''">
-                material_code '%${query.blurry}%'
-            </if>
-        </where>
-    </select>
-</mapper>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/dto/InspectionQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/dto/InspectionQuery.java
deleted file mode 100644
index 43f2fc7a..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/dto/InspectionQuery.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.nl.wms.ql.service.inspection.dto;
-
-import lombok.Data;
-import org.nl.common.domain.query.BaseQuery;
-import org.nl.wms.ql.service.inspection.dao.MdQlInspectionpoint;
-
-/*
- * @author ZZQ
- * @Date 2022/12/15 4:20 下午
- */
-@Data
-public class InspectionQuery extends BaseQuery<MdQlInspectionpoint> {
-
-}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/dto/MaterialInspectionQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/dto/MaterialInspectionQuery.java
deleted file mode 100644
index 18baf548..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/dto/MaterialInspectionQuery.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.nl.wms.ql.service.inspection.dto;
-
-import lombok.Data;
-import org.nl.common.domain.query.BaseQuery;
-import org.nl.wms.ql.service.inspection.dao.MdQlInspectionpoint;
-import org.nl.wms.ql.service.inspection.dao.MdQlMaterialinspection;
-
-/*
- * @author ZZQ
- * @Date 2022/12/15 4:20 下午
- */
-@Data
-public class MaterialInspectionQuery extends BaseQuery<MdQlMaterialinspection> {
-
-}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/dto/MdQlMaterialinspectionDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/dto/MdQlMaterialinspectionDto.java
deleted file mode 100644
index 905f94da..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/dto/MdQlMaterialinspectionDto.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.nl.wms.ql.service.inspection.dto;
-
-import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.nl.wms.ql.service.inspection.dao.MdQlInspectionpoint;
-import org.nl.wms.ql.service.inspection.dao.MdQlMaterialinspection;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 物料检测项点
- * </p>
- *
- * @author generator
- * @since 2023-04-23
- */
-@Data
-public class MdQlMaterialinspectionDto implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 物料id
-     */
-    private String materialCode;
-    /**
-     * 检测项名称
-     */
-    private String name;
-
-    /**
-     * 项目集合{"项目编号"："true"/123.000~123.500}
-     */
-    private List<MdQlInspectionpoint> inspections;
-
-    /**
-     * 版本号
-     */
-    private String version;
-
-    /**
-     * 创建人
-     */
-    private String createId;
-
-    /**
-     * 创建人姓名
-     */
-    private String createName;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 修改人
-     */
-    private String updateId;
-
-    /**
-     * 修改人姓名
-     */
-    private String updateName;
-
-    /**
-     * 修改时间
-     */
-    private Date updateTime;
-
-    /**
-     * 是否启用
-     */
-    private Boolean isUsed;
-
-
-}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/impl/MdQlInspectionpointServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/impl/MdQlInspectionpointServiceImpl.java
deleted file mode 100644
index 5c6bc72b..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/impl/MdQlInspectionpointServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.nl.wms.ql.service.inspection.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import io.jsonwebtoken.lang.Assert;
-import org.nl.common.domain.query.PageQuery;
-import org.nl.common.utils.IdUtil;
-import org.nl.common.utils.SecurityUtils;
-import org.nl.modules.system.util.CodeUtil;
-import org.nl.wms.ql.service.inspection.IMdQlInspectionpointService;
-import org.nl.wms.ql.service.inspection.dao.MdQlInspectionpoint;
-import org.nl.wms.ql.service.inspection.dao.mapper.MdQlInspectionpointMapper;
-import org.nl.wms.ql.service.inspection.dto.InspectionQuery;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-
-/**
- * <p>
- * 检测项点 服务实现类
- * </p>
- *
- * @author generator
- * @since 2023-04-23
- */
-@Service
-public class MdQlInspectionpointServiceImpl extends ServiceImpl<MdQlInspectionpointMapper, MdQlInspectionpoint> implements IMdQlInspectionpointService {
-
-
-    @Override
-    public void create(JSONObject form) {
-        Assert.notNull(form,"请求参数不能为空");
-        MdQlInspectionpoint param = form.toJavaObject(MdQlInspectionpoint.class);
-        param.setInspectionId(IdUtil.getStringId());
-        param.setInspectionCode(CodeUtil.getNewCode("INSPECTION_POINT"));
-        param.setCreateName(SecurityUtils.getCurrentNickName());
-        param.setCreateId(SecurityUtils.getCurrentUserId());
-        param.setCreateTime(new Date());
-        this.save(param);
-    }
-
-    @Override
-    public Page page(InspectionQuery query, PageQuery pageQuery) {
-        return this.page(pageQuery.build(MdQlInspectionpoint.class), query.build());
-    }
-}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/impl/MdQlMaterialinspectionServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/impl/MdQlMaterialinspectionServiceImpl.java
deleted file mode 100644
index 4591c4d2..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/inspection/impl/MdQlMaterialinspectionServiceImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.nl.wms.ql.service.inspection.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import io.jsonwebtoken.lang.Assert;
-import org.nl.common.domain.query.PageQuery;
-import org.nl.common.utils.IdUtil;
-import org.nl.common.utils.SecurityUtils;
-import org.nl.wms.ql.service.inspection.IMdQlMaterialinspectionService;
-import org.nl.wms.ql.service.inspection.dao.MdQlMaterialinspection;
-import org.nl.wms.ql.service.inspection.dao.mapper.MdQlMaterialinspectionMapper;
-import org.nl.wms.ql.service.inspection.dto.MaterialInspectionQuery;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.Date;
-
-/**
- * <p>
- * 物料检测项点 服务实现类
- * </p>
- *
- * @author generator
- * @since 2023-04-23
- */
-@Service
-public class MdQlMaterialinspectionServiceImpl extends ServiceImpl<MdQlMaterialinspectionMapper, MdQlMaterialinspection> implements IMdQlMaterialinspectionService {
-
-    @Resource
-    MdQlMaterialinspectionMapper mdQlMaterialinspectionMapper;
-    @Override
-    public void create(JSONObject form) {
-        Assert.notNull(form,"请求参数不能为空");
-        MdQlMaterialinspection param = form.toJavaObject(MdQlMaterialinspection.class);
-        param.setInspections(IdUtil.getStringId());
-        param.setCreateName(SecurityUtils.getCurrentNickName());
-        param.setCreateId(SecurityUtils.getCurrentUserId());
-        param.setCreateTime(new Date());
-        this.save(param);
-    }
-
-    @Override
-    public Page pageQuery(MaterialInspectionQuery query, PageQuery pageQuery) {
-        return this.page(pageQuery.build(MdQlMaterialinspection.class), query.build());
-    }
-
-}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/report/IMdMeInspectionsheetService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/report/IMdMeInspectionsheetService.java
deleted file mode 100644
index 27f0499d..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/report/IMdMeInspectionsheetService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.nl.wms.ql.service.report;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.nl.wms.ql.service.report.dao.MdMeInspectionsheet;
-
-/**
- * <p>
- * 质检报告 服务类
- * </p>
- *
- * @author generator
- * @since 2023-04-23
- */
-public interface IMdMeInspectionsheetService extends IService<MdMeInspectionsheet> {
-
-}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/report/dao/MdMeInspectionsheet.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/report/dao/MdMeInspectionsheet.java
deleted file mode 100644
index 89664d96..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/report/dao/MdMeInspectionsheet.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.nl.wms.ql.service.report.dao;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 质检报告
- * </p>
- *
- * @author generator
- * @since 2023-04-23
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("md_me_inspectionsheet")
-public class MdMeInspectionsheet implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 质检id
-     */
-    private String inspectionsheetId;
-
-    /**
-     * 质检编号
-     */
-    private String inspectionsheetCode;
-
-    /**
-     * 物料id
-     */
-    private String materialId;
-
-    /**
-     * 批次
-     */
-    private String pcsn;
-
-    /**
-     * 质检单类型
-     */
-    private String type;
-
-    /**
-     * 检测项目集合
-     */
-    private String inspections;
-
-    /**
-     * 创建人
-     */
-    private String createId;
-
-    /**
-     * 创建人姓名
-     */
-    private String createName;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 修改人
-     */
-    private String updateId;
-
-    /**
-     * 修改人姓名
-     */
-    private String updateName;
-
-    /**
-     * 修改时间
-     */
-    private Date updateTime;
-
-    /**
-     * 是否删除
-     */
-    private Boolean isDeleted;
-
-
-}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/report/dao/mapper/MdMeInspectionsheetMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/report/dao/mapper/MdMeInspectionsheetMapper.java
deleted file mode 100644
index d8eccc86..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/report/dao/mapper/MdMeInspectionsheetMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.nl.wms.ql.service.report.dao.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.nl.wms.ql.service.report.dao.MdMeInspectionsheet;
-
-/**
- * <p>
- * 质检报告 Mapper 接口
- * </p>
- *
- * @author generator
- * @since 2023-04-23
- */
-public interface MdMeInspectionsheetMapper extends BaseMapper<MdMeInspectionsheet> {
-
-}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/report/impl/MdMeInspectionsheetServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/report/impl/MdMeInspectionsheetServiceImpl.java
deleted file mode 100644
index ad326b70..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/report/impl/MdMeInspectionsheetServiceImpl.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.nl.wms.ql.service.report.impl;
-
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.nl.wms.ql.service.report.IMdMeInspectionsheetService;
-import org.nl.wms.ql.service.report.dao.MdMeInspectionsheet;
-import org.nl.wms.ql.service.report.dao.mapper.MdMeInspectionsheetMapper;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 质检报告 服务实现类
- * </p>
- *
- * @author generator
- * @since 2023-04-23
- */
-@Service
-public class MdMeInspectionsheetServiceImpl extends ServiceImpl<MdMeInspectionsheetMapper, MdMeInspectionsheet> implements IMdMeInspectionsheetService {
-
-}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionitempointController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionitempointController.java
new file mode 100644
index 00000000..91f0a278
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionitempointController.java
@@ -0,0 +1,21 @@
+package org.nl.wms.quality_manage.controller.inspection;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 检验项点表 前端控制器
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-06
+ */
+@RestController
+@RequestMapping("/qlTestInspectionitempoint")
+public class QlTestInspectionitempointController {
+
+}
+
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionschemedtlController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionschemedtlController.java
new file mode 100644
index 00000000..982a2dd7
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionschemedtlController.java
@@ -0,0 +1,21 @@
+package org.nl.wms.quality_manage.controller.inspection;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 检验方案明细表 前端控制器
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-06
+ */
+@RestController
+@RequestMapping("/qlTestInspectionschemedtl")
+public class QlTestInspectionschemedtlController {
+
+}
+
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionschemedtlproductstandardController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionschemedtlproductstandardController.java
new file mode 100644
index 00000000..8c40aff3
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionschemedtlproductstandardController.java
@@ -0,0 +1,21 @@
+package org.nl.wms.quality_manage.controller.inspection;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 产品检验方案标准表 前端控制器
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-06
+ */
+@RestController
+@RequestMapping("/qlTestInspectionschemedtlproductstandard")
+public class QlTestInspectionschemedtlproductstandardController {
+
+}
+
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionschememstController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionschememstController.java
new file mode 100644
index 00000000..4454d137
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionschememstController.java
@@ -0,0 +1,21 @@
+package org.nl.wms.quality_manage.controller.inspection;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 检验方案主表 前端控制器
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-06
+ */
+@RestController
+@RequestMapping("/qlTestInspectionschememst")
+public class QlTestInspectionschememstController {
+
+}
+
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/report/QlTestInspectionsheetdtlController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/report/QlTestInspectionsheetdtlController.java
new file mode 100644
index 00000000..34b011a6
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/report/QlTestInspectionsheetdtlController.java
@@ -0,0 +1,21 @@
+package org.nl.wms.quality_manage.controller.report;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 质检单明细表 前端控制器
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-06
+ */
+@RestController
+@RequestMapping("/qlTestInspectionsheetdtl")
+public class QlTestInspectionsheetdtlController {
+
+}
+
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/report/QlTestInspectionsheetmstController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/report/QlTestInspectionsheetmstController.java
new file mode 100644
index 00000000..12ad4599
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/report/QlTestInspectionsheetmstController.java
@@ -0,0 +1,21 @@
+package org.nl.wms.quality_manage.controller.report;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 质检单主表 前端控制器
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-06
+ */
+@RestController
+@RequestMapping("/qlTestInspectionsheetmst")
+public class QlTestInspectionsheetmstController {
+
+}
+
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/ql.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/ql.xls
deleted file mode 100644
index ee415cde..00000000
Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/ql.xls and /dev/null differ
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/IQlTestInspectionitempointService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/IQlTestInspectionitempointService.java
new file mode 100644
index 00000000..5dd87234
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/IQlTestInspectionitempointService.java
@@ -0,0 +1,16 @@
+package org.nl.wms.quality_manage.service.inspection;
+
+import org.nl.wms.quality_manage.service.inspection.dao.QlTestInspectionitempoint;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 检验项点表 服务类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-06
+ */
+public interface IQlTestInspectionitempointService extends IService<QlTestInspectionitempoint> {
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/IQlTestInspectionschemedtlService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/IQlTestInspectionschemedtlService.java
new file mode 100644
index 00000000..8e9382f2
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/IQlTestInspectionschemedtlService.java
@@ -0,0 +1,16 @@
+package org.nl.wms.quality_manage.service.inspection;
+
+import org.nl.wms.quality_manage.service.inspection.dao.QlTestInspectionschemedtl;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 检验方案明细表 服务类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-06
+ */
+public interface IQlTestInspectionschemedtlService extends IService<QlTestInspectionschemedtl> {
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/IQlTestInspectionschemedtlproductstandardService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/IQlTestInspectionschemedtlproductstandardService.java
new file mode 100644
index 00000000..b46d7bf1
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/IQlTestInspectionschemedtlproductstandardService.java
@@ -0,0 +1,16 @@
+package org.nl.wms.quality_manage.service.inspection;
+
+import org.nl.wms.quality_manage.service.inspection.dao.QlTestInspectionschemedtlproductstandard;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 产品检验方案标准表 服务类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-06
+ */
+public interface IQlTestInspectionschemedtlproductstandardService extends IService<QlTestInspectionschemedtlproductstandard> {
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/IQlTestInspectionschememstService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/IQlTestInspectionschememstService.java
new file mode 100644
index 00000000..69f94db5
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/IQlTestInspectionschememstService.java
@@ -0,0 +1,16 @@
+package org.nl.wms.quality_manage.service.inspection;
+
+import org.nl.wms.quality_manage.service.inspection.dao.QlTestInspectionschememst;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 检验方案主表 服务类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-06
+ */
+public interface IQlTestInspectionschememstService extends IService<QlTestInspectionschememst> {
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/QlTestInspectionitempoint.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/QlTestInspectionitempoint.java
new file mode 100644
index 00000000..d70177e3
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/QlTestInspectionitempoint.java
@@ -0,0 +1,100 @@
+package org.nl.wms.quality_manage.service.inspection.dao;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 检验项点表
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("ql_test_inspectionitempoint")
+public class QlTestInspectionitempoint implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 项点标识
+     */
+    private String inspection_item_id;
+
+    /**
+     * 项点编码
+     */
+    private String inspection_item_code;
+
+    /**
+     * 项点名称
+     */
+    private String inspection_item_name;
+
+    /**
+     * 项点类别
+     */
+    private String inspection_item_type;
+
+    /**
+     * 检验方式
+     */
+    private String inspection_type;
+
+    /**
+     * 物料编号
+     */
+    private String material_code;
+
+    /**
+     * 物料id
+     */
+    private String material_id;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    private String create_id;
+
+    /**
+     * 创建人姓名
+     */
+    private String create_name;
+
+    /**
+     * 创建时间
+     */
+    private Date create_time;
+
+    /**
+     * 修改人
+     */
+    private String update_id;
+
+    /**
+     * 修改人姓名
+     */
+    private String update_name;
+
+    /**
+     * 修改时间
+     */
+    private Date update_time;
+
+    /**
+     * 是否临界值填充备注
+     */
+    private Boolean is_limit_remark;
+
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/QlTestInspectionschemedtl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/QlTestInspectionschemedtl.java
new file mode 100644
index 00000000..9419959a
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/QlTestInspectionschemedtl.java
@@ -0,0 +1,69 @@
+package org.nl.wms.quality_manage.service.inspection.dao;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 检验方案明细表
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("ql_test_inspectionschemedtl")
+public class QlTestInspectionschemedtl implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 检验方案明细标识
+     */
+    private String inspection_scheme_dtl_id;
+
+    /**
+     * 检验方案标识
+     */
+    private String inspection_scheme_id;
+
+    /**
+     * 检验方案编码
+     */
+    private String inspection_scheme_code;
+
+    /**
+     * 检验方案名称
+     */
+    private String inspection_scheme_name;
+
+    /**
+     * 项点标识
+     */
+    private String inspection_item_id;
+
+    /**
+     * 项点编码
+     */
+    private String inspection_item_code;
+
+    /**
+     * 项点名称
+     */
+    private String inspection_item_name;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 显示顺序
+     */
+    private Integer order_index;
+
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/QlTestInspectionschemedtlproductstandard.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/QlTestInspectionschemedtlproductstandard.java
new file mode 100644
index 00000000..1c64ce9e
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/QlTestInspectionschemedtlproductstandard.java
@@ -0,0 +1,95 @@
+package org.nl.wms.quality_manage.service.inspection.dao;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 产品检验方案标准表
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("ql_test_inspectionschemedtlproductstandard")
+public class QlTestInspectionschemedtlproductstandard implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 检验方案明细标准标识
+     */
+    private String inspection_standard_dtl_id;
+
+    /**
+     * 物料标识
+     */
+    private String material_code;
+
+    /**
+     * 物料id
+     */
+    private String material_id;
+
+    /**
+     * 检验方案标识
+     */
+    private String inspection_scheme_id;
+
+    /**
+     * 检验方案编码
+     */
+    private String inspection_scheme_code;
+
+    /**
+     * 检验方案名称
+     */
+    private String inspection_scheme_name;
+
+    /**
+     * 项点标识
+     */
+    private String inspection_item_id;
+
+    /**
+     * 项点编码
+     */
+    private String inspection_item_code;
+
+    /**
+     * 项点名称
+     */
+    private String inspection_item_name;
+
+    /**
+     * 合格上限
+     */
+    private BigDecimal up_limit;
+
+    /**
+     * 合格下限
+     */
+    private BigDecimal down_limit;
+
+    /**
+     * 上限临界值
+     */
+    private BigDecimal up_limit_value;
+
+    /**
+     * 下限临界值
+     */
+    private BigDecimal down_limit_value;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/QlTestInspectionschememst.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/QlTestInspectionschememst.java
new file mode 100644
index 00000000..27a61a36
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/QlTestInspectionschememst.java
@@ -0,0 +1,101 @@
+package org.nl.wms.quality_manage.service.inspection.dao;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 检验方案主表
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("ql_test_inspectionschememst")
+public class QlTestInspectionschememst implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 检验方案标识
+     */
+    private String inspection_scheme_id;
+
+    /**
+     * 检验方案编码
+     */
+    private String inspection_scheme_code;
+
+    /**
+     * 检验方案名称
+     */
+    private String inspection_scheme_name;
+
+    /**
+     * 检验方案类别
+     */
+    private String inspection_scheme_type;
+
+    /**
+     * 厂家质保项数量
+     */
+    private BigDecimal factory_qty;
+
+    /**
+     * 工序检验项数量
+     */
+    private BigDecimal workprocedure_qty;
+
+    /**
+     * 理化检验项数量
+     */
+    private BigDecimal physical_qty;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 是否启用
+     */
+    private Boolean is_used;
+
+    /**
+     * 创建人
+     */
+    private String create_id;
+
+    /**
+     * 创建人姓名
+     */
+    private String create_name;
+
+    /**
+     * 创建时间
+     */
+    private Date create_time;
+
+    /**
+     * 修改人
+     */
+    private String update_optid;
+
+    /**
+     * 修改人姓名
+     */
+    private String update_optname;
+
+    /**
+     * 修改时间
+     */
+    private Date update_time;
+
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/mapper/QlTestInspectionitempointMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/mapper/QlTestInspectionitempointMapper.java
new file mode 100644
index 00000000..b1ee4c52
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/mapper/QlTestInspectionitempointMapper.java
@@ -0,0 +1,16 @@
+package org.nl.wms.quality_manage.service.inspection.dao.mapper;
+
+import org.nl.wms.quality_manage.service.inspection.dao.QlTestInspectionitempoint;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 检验项点表 Mapper 接口
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-06
+ */
+public interface QlTestInspectionitempointMapper extends BaseMapper<QlTestInspectionitempoint> {
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/mapper/QlTestInspectionitempointMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/mapper/QlTestInspectionitempointMapper.xml
new file mode 100644
index 00000000..2ff7ac11
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/mapper/QlTestInspectionitempointMapper.xml
@@ -0,0 +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.quality_manage.service.inspection.dao.mapper.QlTestInspectionitempointMapper">
+
+</mapper>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/mapper/QlTestInspectionschemedtlMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/mapper/QlTestInspectionschemedtlMapper.java
new file mode 100644
index 00000000..15fa08ae
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/mapper/QlTestInspectionschemedtlMapper.java
@@ -0,0 +1,16 @@
+package org.nl.wms.quality_manage.service.inspection.dao.mapper;
+
+import org.nl.wms.quality_manage.service.inspection.dao.QlTestInspectionschemedtl;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 检验方案明细表 Mapper 接口
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-06
+ */
+public interface QlTestInspectionschemedtlMapper extends BaseMapper<QlTestInspectionschemedtl> {
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/mapper/QlTestInspectionschemedtlMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/mapper/QlTestInspectionschemedtlMapper.xml
new file mode 100644
index 00000000..63525ef6
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/mapper/QlTestInspectionschemedtlMapper.xml
@@ -0,0 +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.quality_manage.service.inspection.dao.mapper.QlTestInspectionschemedtlMapper">
+
+</mapper>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/mapper/QlTestInspectionschemedtlproductstandardMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/mapper/QlTestInspectionschemedtlproductstandardMapper.java
new file mode 100644
index 00000000..71ae8933
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/mapper/QlTestInspectionschemedtlproductstandardMapper.java
@@ -0,0 +1,16 @@
+package org.nl.wms.quality_manage.service.inspection.dao.mapper;
+
+import org.nl.wms.quality_manage.service.inspection.dao.QlTestInspectionschemedtlproductstandard;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 产品检验方案标准表 Mapper 接口
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-06
+ */
+public interface QlTestInspectionschemedtlproductstandardMapper extends BaseMapper<QlTestInspectionschemedtlproductstandard> {
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/mapper/QlTestInspectionschemedtlproductstandardMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/mapper/QlTestInspectionschemedtlproductstandardMapper.xml
new file mode 100644
index 00000000..200280e1
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/mapper/QlTestInspectionschemedtlproductstandardMapper.xml
@@ -0,0 +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.quality_manage.service.inspection.dao.mapper.QlTestInspectionschemedtlproductstandardMapper">
+
+</mapper>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/mapper/QlTestInspectionschememstMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/mapper/QlTestInspectionschememstMapper.java
new file mode 100644
index 00000000..8535c23a
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/mapper/QlTestInspectionschememstMapper.java
@@ -0,0 +1,16 @@
+package org.nl.wms.quality_manage.service.inspection.dao.mapper;
+
+import org.nl.wms.quality_manage.service.inspection.dao.QlTestInspectionschememst;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 检验方案主表 Mapper 接口
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-06
+ */
+public interface QlTestInspectionschememstMapper extends BaseMapper<QlTestInspectionschememst> {
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/mapper/QlTestInspectionschememstMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/mapper/QlTestInspectionschememstMapper.xml
new file mode 100644
index 00000000..3c51e183
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/dao/mapper/QlTestInspectionschememstMapper.xml
@@ -0,0 +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.quality_manage.service.inspection.dao.mapper.QlTestInspectionschememstMapper">
+
+</mapper>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/impl/QlTestInspectionitempointServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/impl/QlTestInspectionitempointServiceImpl.java
new file mode 100644
index 00000000..9bce1a28
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/impl/QlTestInspectionitempointServiceImpl.java
@@ -0,0 +1,20 @@
+package org.nl.wms.quality_manage.service.inspection.impl;
+
+import org.nl.wms.quality_manage.service.inspection.dao.QlTestInspectionitempoint;
+import org.nl.wms.quality_manage.service.inspection.dao.mapper.QlTestInspectionitempointMapper;
+import org.nl.wms.quality_manage.service.inspection.IQlTestInspectionitempointService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 检验项点表 服务实现类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-06
+ */
+@Service
+public class QlTestInspectionitempointServiceImpl extends ServiceImpl<QlTestInspectionitempointMapper, QlTestInspectionitempoint> implements IQlTestInspectionitempointService {
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/impl/QlTestInspectionschemedtlServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/impl/QlTestInspectionschemedtlServiceImpl.java
new file mode 100644
index 00000000..fd9836d4
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/impl/QlTestInspectionschemedtlServiceImpl.java
@@ -0,0 +1,20 @@
+package org.nl.wms.quality_manage.service.inspection.impl;
+
+import org.nl.wms.quality_manage.service.inspection.dao.QlTestInspectionschemedtl;
+import org.nl.wms.quality_manage.service.inspection.dao.mapper.QlTestInspectionschemedtlMapper;
+import org.nl.wms.quality_manage.service.inspection.IQlTestInspectionschemedtlService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 检验方案明细表 服务实现类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-06
+ */
+@Service
+public class QlTestInspectionschemedtlServiceImpl extends ServiceImpl<QlTestInspectionschemedtlMapper, QlTestInspectionschemedtl> implements IQlTestInspectionschemedtlService {
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/impl/QlTestInspectionschemedtlproductstandardServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/impl/QlTestInspectionschemedtlproductstandardServiceImpl.java
new file mode 100644
index 00000000..9b374419
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/impl/QlTestInspectionschemedtlproductstandardServiceImpl.java
@@ -0,0 +1,20 @@
+package org.nl.wms.quality_manage.service.inspection.impl;
+
+import org.nl.wms.quality_manage.service.inspection.dao.QlTestInspectionschemedtlproductstandard;
+import org.nl.wms.quality_manage.service.inspection.dao.mapper.QlTestInspectionschemedtlproductstandardMapper;
+import org.nl.wms.quality_manage.service.inspection.IQlTestInspectionschemedtlproductstandardService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 产品检验方案标准表 服务实现类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-06
+ */
+@Service
+public class QlTestInspectionschemedtlproductstandardServiceImpl extends ServiceImpl<QlTestInspectionschemedtlproductstandardMapper, QlTestInspectionschemedtlproductstandard> implements IQlTestInspectionschemedtlproductstandardService {
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/impl/QlTestInspectionschememstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/impl/QlTestInspectionschememstServiceImpl.java
new file mode 100644
index 00000000..84412eb4
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/inspection/impl/QlTestInspectionschememstServiceImpl.java
@@ -0,0 +1,20 @@
+package org.nl.wms.quality_manage.service.inspection.impl;
+
+import org.nl.wms.quality_manage.service.inspection.dao.QlTestInspectionschememst;
+import org.nl.wms.quality_manage.service.inspection.dao.mapper.QlTestInspectionschememstMapper;
+import org.nl.wms.quality_manage.service.inspection.IQlTestInspectionschememstService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 检验方案主表 服务实现类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-06
+ */
+@Service
+public class QlTestInspectionschememstServiceImpl extends ServiceImpl<QlTestInspectionschememstMapper, QlTestInspectionschememst> implements IQlTestInspectionschememstService {
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/IQlTestInspectionsheetdtlService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/IQlTestInspectionsheetdtlService.java
new file mode 100644
index 00000000..cfa554e5
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/IQlTestInspectionsheetdtlService.java
@@ -0,0 +1,16 @@
+package org.nl.wms.quality_manage.service.report;
+
+import org.nl.wms.quality_manage.service.report.dao.QlTestInspectionsheetdtl;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 质检单明细表 服务类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-06
+ */
+public interface IQlTestInspectionsheetdtlService extends IService<QlTestInspectionsheetdtl> {
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/IQlTestInspectionsheetmstService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/IQlTestInspectionsheetmstService.java
new file mode 100644
index 00000000..8c8559a6
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/IQlTestInspectionsheetmstService.java
@@ -0,0 +1,16 @@
+package org.nl.wms.quality_manage.service.report;
+
+import org.nl.wms.quality_manage.service.report.dao.QlTestInspectionsheetmst;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 质检单主表 服务类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-06
+ */
+public interface IQlTestInspectionsheetmstService extends IService<QlTestInspectionsheetmst> {
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/dao/QlTestInspectionsheetdtl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/dao/QlTestInspectionsheetdtl.java
new file mode 100644
index 00000000..79b692cd
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/dao/QlTestInspectionsheetdtl.java
@@ -0,0 +1,145 @@
+package org.nl.wms.quality_manage.service.report.dao;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 质检单明细表
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("ql_test_inspectionsheetdtl")
+public class QlTestInspectionsheetdtl implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 质检单明细标识
+     */
+    private String inspectiondtl_id;
+
+    /**
+     * 质检单标识
+     */
+    private String inspection_id;
+
+    /**
+     * 明细序号
+     */
+    private BigDecimal seq_no;
+
+    /**
+     * 物料标识
+     */
+    private Long material_id;
+
+    /**
+     * 批次
+     */
+    private String pcsn;
+
+    /**
+     * 明细状态
+     */
+    private String bill_status;
+
+    /**
+     * 数量
+     */
+    private BigDecimal qty;
+
+    /**
+     * 合格数量
+     */
+    private BigDecimal qty_ok;
+
+    /**
+     * 不合格数量
+     */
+    private BigDecimal qty_no;
+
+    /**
+     * 数量计量单位标识
+     */
+    private String qty_unit_id;
+
+    /**
+     * 数量计量单位名称
+     */
+    private String qty_unit_name;
+
+    /**
+     * 结果
+     */
+    private String result;
+
+    /**
+     * 等级
+     */
+    private String grade;
+
+    /**
+     * 来源单据标识
+     */
+    private String source_bill_id;
+
+    /**
+     * 来源单据类型
+     */
+    private String source_bill_type;
+
+    /**
+     * 来源单据编号
+     */
+    private String source_bill_code;
+
+    /**
+     * 来源单表
+     */
+    private String source_bill_table;
+
+    /**
+     * 来源单表主键
+     */
+    private String source_bill_table_pk;
+
+    /**
+     * 基础单据标识
+     */
+    private String base_bill_id;
+
+    /**
+     * 基础单据类型
+     */
+    private String base_bill_type;
+
+    /**
+     * 基础单编号
+     */
+    private String base_bill_code;
+
+    /**
+     * 基础单表
+     */
+    private String base_bill_table;
+
+    /**
+     * 基础单表主键
+     */
+    private String base_bill_table_pk;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/dao/QlTestInspectionsheetmst.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/dao/QlTestInspectionsheetmst.java
new file mode 100644
index 00000000..3e59f59a
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/dao/QlTestInspectionsheetmst.java
@@ -0,0 +1,141 @@
+package org.nl.wms.quality_manage.service.report.dao;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 质检单主表
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("ql_test_inspectionsheetmst")
+public class QlTestInspectionsheetmst implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 质检单标识
+     */
+    private String inspection_id;
+
+    /**
+     * 质检单编号
+     */
+    private String inspection_code;
+
+    /**
+     * 质检单类型
+     */
+    private String inspection_type;
+
+    /**
+     * 业务日期
+     */
+    private Date biz_date;
+
+    /**
+     * 总数量
+     */
+    private BigDecimal total_qty;
+
+    /**
+     * 数量计量单位标识
+     */
+    private String qty_unit_id;
+
+    /**
+     * 数量计量单位名称
+     */
+    private String qty_unit_name;
+
+    /**
+     * 单据状态
+     */
+    private String bill_status;
+
+    /**
+     * 生成方式
+     */
+    private String create_mode;
+
+    /**
+     * 创建人
+     */
+    private String create_id;
+
+    /**
+     * 创建人姓名
+     */
+    private String create_name;
+
+    /**
+     * 创建时间
+     */
+    private String create_time;
+
+    /**
+     * 修改人
+     */
+    private String update_optid;
+
+    /**
+     * 修改人姓名
+     */
+    private String update_optname;
+
+    /**
+     * 修改时间
+     */
+    private Date update_time;
+
+    /**
+     * 确认人
+     */
+    private String confirm_id;
+
+    /**
+     * 确认人姓名
+     */
+    private String confirm_name;
+
+    /**
+     * 确认时间
+     */
+    private Date confirm_time;
+
+    /**
+     * 部门ID
+     */
+    private String sysdeptid;
+
+    /**
+     * 公司ID
+     */
+    private String syscompanyid;
+
+    /**
+     * 是否删除
+     */
+    private Boolean is_delete;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 车间标识
+     */
+    private String product_area;
+
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/dao/mapper/QlTestInspectionsheetdtlMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/dao/mapper/QlTestInspectionsheetdtlMapper.java
new file mode 100644
index 00000000..10b170e2
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/dao/mapper/QlTestInspectionsheetdtlMapper.java
@@ -0,0 +1,16 @@
+package org.nl.wms.quality_manage.service.report.dao.mapper;
+
+import org.nl.wms.quality_manage.service.report.dao.QlTestInspectionsheetdtl;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 质检单明细表 Mapper 接口
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-06
+ */
+public interface QlTestInspectionsheetdtlMapper extends BaseMapper<QlTestInspectionsheetdtl> {
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/report/dao/mapper/MdMeInspectionsheetMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/dao/mapper/QlTestInspectionsheetdtlMapper.xml
similarity index 60%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/report/dao/mapper/MdMeInspectionsheetMapper.xml
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/dao/mapper/QlTestInspectionsheetdtlMapper.xml
index 3b53658d..872bb42a 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/report/dao/mapper/MdMeInspectionsheetMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/dao/mapper/QlTestInspectionsheetdtlMapper.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.ql.service.report.dao.mapper.MdMeInspectionsheetMapper">
+<mapper namespace="org.nl.wms.quality_manage.service.report.dao.mapper.QlTestInspectionsheetdtlMapper">
 
 </mapper>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/dao/mapper/QlTestInspectionsheetmstMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/dao/mapper/QlTestInspectionsheetmstMapper.java
new file mode 100644
index 00000000..01a37bbd
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/dao/mapper/QlTestInspectionsheetmstMapper.java
@@ -0,0 +1,16 @@
+package org.nl.wms.quality_manage.service.report.dao.mapper;
+
+import org.nl.wms.quality_manage.service.report.dao.QlTestInspectionsheetmst;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 质检单主表 Mapper 接口
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-06
+ */
+public interface QlTestInspectionsheetmstMapper extends BaseMapper<QlTestInspectionsheetmst> {
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/dao/mapper/QlTestInspectionsheetmstMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/dao/mapper/QlTestInspectionsheetmstMapper.xml
new file mode 100644
index 00000000..81a1db1c
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/dao/mapper/QlTestInspectionsheetmstMapper.xml
@@ -0,0 +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.quality_manage.service.report.dao.mapper.QlTestInspectionsheetmstMapper">
+
+</mapper>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/impl/QlTestInspectionsheetdtlServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/impl/QlTestInspectionsheetdtlServiceImpl.java
new file mode 100644
index 00000000..55b38394
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/impl/QlTestInspectionsheetdtlServiceImpl.java
@@ -0,0 +1,20 @@
+package org.nl.wms.quality_manage.service.report.impl;
+
+import org.nl.wms.quality_manage.service.report.dao.QlTestInspectionsheetdtl;
+import org.nl.wms.quality_manage.service.report.dao.mapper.QlTestInspectionsheetdtlMapper;
+import org.nl.wms.quality_manage.service.report.IQlTestInspectionsheetdtlService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 质检单明细表 服务实现类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-06
+ */
+@Service
+public class QlTestInspectionsheetdtlServiceImpl extends ServiceImpl<QlTestInspectionsheetdtlMapper, QlTestInspectionsheetdtl> implements IQlTestInspectionsheetdtlService {
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/impl/QlTestInspectionsheetmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/impl/QlTestInspectionsheetmstServiceImpl.java
new file mode 100644
index 00000000..59239d96
--- /dev/null
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/impl/QlTestInspectionsheetmstServiceImpl.java
@@ -0,0 +1,20 @@
+package org.nl.wms.quality_manage.service.report.impl;
+
+import org.nl.wms.quality_manage.service.report.dao.QlTestInspectionsheetmst;
+import org.nl.wms.quality_manage.service.report.dao.mapper.QlTestInspectionsheetmstMapper;
+import org.nl.wms.quality_manage.service.report.IQlTestInspectionsheetmstService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 质检单主表 服务实现类
+ * </p>
+ *
+ * @author generator
+ * @since 2023-05-06
+ */
+@Service
+public class QlTestInspectionsheetmstServiceImpl extends ServiceImpl<QlTestInspectionsheetmstMapper, QlTestInspectionsheetmst> implements IQlTestInspectionsheetmstService {
+
+}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IOSEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IOSEnum.java
index e2a3e872..d512eedf 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IOSEnum.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/IOSEnum.java
@@ -20,7 +20,7 @@ public enum IOSEnum {
     //单据类型
     BILL_TYPE(MapOf.of("生产入库","1","退货入库","2")),
     //单据类型
-   BILL_STATUS(MapOf.of("创建","1","生成","2")),
+   BILL_STATUS(MapOf.of("生成","1","提交","2")),
     //单据状态
    WORK_STATUS(MapOf.of("创建","1","生成","2")),
     ;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/storage/StIvtBsrealstorattrController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/storage/StIvtBsrealstorattrController.java
index 589e9964..c34bed83 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/storage/StIvtBsrealstorattrController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/storage/StIvtBsrealstorattrController.java
@@ -1,9 +1,21 @@
 package org.nl.wms.storage_manage.basedata.controller.storage;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.swagger.annotations.ApiOperation;
+import org.nl.common.TableDataInfo;
+import org.nl.common.anno.Log;
+import org.nl.wms.storage_manage.basedata.service.storage.IStIvtBsrealstorattrService;
+import org.nl.wms.storage_manage.basedata.service.storage.dao.StIvtBsrealstorattr;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
  * 实物库属性表 前端控制器
@@ -16,5 +28,16 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/stIvtBsrealstorattr")
 public class StIvtBsrealstorattrController {
 
+    @Autowired
+    protected IStIvtBsrealstorattrService stIvtBsrealstorattrService;
+
+
+    @PostMapping("/queryStor")
+    @Log("查询仓库")
+    @ApiOperation("查询仓库")
+    public ResponseEntity<Object> queryStor() {
+        List<StIvtBsrealstorattr> list = stIvtBsrealstorattrService.list(new QueryWrapper<StIvtBsrealstorattr>().eq("is_used", true));
+        return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK);
+    }
 }
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/dao/StIvtBsrealstorattr.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/dao/StIvtBsrealstorattr.java
index 8a7378ec..cb31a349 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/dao/StIvtBsrealstorattr.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/dao/StIvtBsrealstorattr.java
@@ -6,6 +6,7 @@ import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * <p>
@@ -25,7 +26,7 @@ public class StIvtBsrealstorattr implements Serializable {
     /**
      * 仓库标识
      */
-    private Long stor_id;
+    private String stor_id;
 
     /**
      * 仓库编码
@@ -63,44 +64,24 @@ public class StIvtBsrealstorattr implements Serializable {
     private String product_area;
 
     /**
-     * 是否虚拟库
+     * 仓库类型1虚拟库2半成品库3原料库4成品库5备件库
      */
-    private String is_virtualstore;
-
-    /**
-     * 是否半成品库
-     */
-    private String is_semi_finished;
-
-    /**
-     * 是否原料库
-     */
-    private String is_materialstore;
-
-    /**
-     * 是否成品库
-     */
-    private String is_productstore;
-
-    /**
-     * 是否备件库
-     */
-    private String is_attachment;
+    private String stor_type;
 
     /**
      * 是否允许红冲
      */
-    private String is_reversed;
+    private Boolean is_reversed;
 
     /**
      * 是否移出业务自动确认
      */
-    private String is_mvout_auto_cfm;
+    private Boolean is_mvout_auto_cfm;
 
     /**
      * 是否移入业务自动确认
      */
-    private String is_mvin_auto_cfm;
+    private Boolean is_mvin_auto_cfm;
 
     /**
      * 地区
@@ -135,7 +116,7 @@ public class StIvtBsrealstorattr implements Serializable {
     /**
      * 显示顺序
      */
-    private BigDecimal order_index;
+    private Integer order_index;
 
     /**
      * 状态
@@ -145,7 +126,7 @@ public class StIvtBsrealstorattr implements Serializable {
     /**
      * 是否启用
      */
-    private String is_used;
+    private Boolean is_used;
 
     /**
      * 物料基本分类
@@ -155,7 +136,7 @@ public class StIvtBsrealstorattr implements Serializable {
     /**
      * 创建人
      */
-    private Long create_id;
+    private String create_id;
 
     /**
      * 创建人姓名
@@ -165,12 +146,12 @@ public class StIvtBsrealstorattr implements Serializable {
     /**
      * 创建时间
      */
-    private String create_time;
+    private Date create_time;
 
     /**
      * 修改人
      */
-    private Long update_id;
+    private String update_id;
 
     /**
      * 修改人姓名
@@ -180,27 +161,23 @@ public class StIvtBsrealstorattr implements Serializable {
     /**
      * 修改时间
      */
-    private String update_time;
+    private Date update_time;
 
     /**
      * 拥有者ID
      */
-    private Long sysownerid;
+    private String sysownerid;
 
     /**
      * 部门ID
      */
-    private Long sysdeptid;
+    private String sysdeptid;
 
     /**
      * 公司ID
      */
     private Long syscompanyid;
 
-    /**
-     * 是否删除
-     */
-    private String is_delete;
 
     /**
      * 外部标识
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/ProductInController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/ProductInController.java
deleted file mode 100644
index 9fefc5b2..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/ProductInController.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package org.nl.wms.storage_manage.productmanage.controller.iostorInv;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.common.anno.Log;
-import org.nl.wms.storage_manage.service.product.ProductInService;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-//@RestController
-@RequiredArgsConstructor
-//@Api(tags = "成品入库")
-//@RequestMapping("/api/in/productIn")
-//@Slf4j
-public class ProductInController {
-
-    private final ProductInService productInService;
-
-    @GetMapping
-    @Log("查询入库单据")
-    @ApiOperation("查询入库单据")
-    public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) {
-        return new ResponseEntity<>(productInService.pageQuery(whereJson, page), HttpStatus.OK);
-    }
-
-    @Log("删除出入库单")
-    @ApiOperation("删除出入库单")
-    @DeleteMapping
-    public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
-        productInService.deleteAll(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-    @GetMapping("/getBillDtl")
-    @Log("查询入库单来源")
-    @ApiOperation("查询入库单来源")
-    public ResponseEntity<Object> getBillDtl(@RequestParam Map whereJson, Pageable page) {
-        return new ResponseEntity<>(productInService.getBillDtl(whereJson, page), HttpStatus.OK);
-    }
-
-    @PostMapping()
-    @Log("新增入库单")
-    @ApiOperation("新增入库单")
-    public ResponseEntity<Object> insertDtl(@RequestBody JSONObject whereJson) {
-        productInService.insertDtl(whereJson);
-        return new ResponseEntity<>(HttpStatus.CREATED);
-    }
-
-    @PutMapping
-    @Log("修改入库单")
-    @ApiOperation("修改入库单")
-    public ResponseEntity<Object> update(@RequestBody JSONObject whereJson) {
-        productInService.update(whereJson);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @PostMapping("/queryStor")
-    @Log("查询仓库")
-    @ApiOperation("查询仓库")
-    public ResponseEntity<Object> queryStor() {
-        return new ResponseEntity<>(productInService.queryStor(), HttpStatus.OK);
-    }
-
-    @PostMapping("/getIODtl")
-    @Log("查询出入库单明细")
-    @ApiOperation("查询出入库单明细")
-    public ResponseEntity<Object> getIODtl(@RequestBody JSONObject whereJson) {
-        return new ResponseEntity<>(productInService.getIODtl(whereJson), HttpStatus.OK);
-    }
-
-    @PostMapping("/commit")
-    @Log("出入单提交")
-    @ApiOperation("出入单提交")
-    public ResponseEntity<Object> commit(@RequestBody Map whereJson) {
-        productInService.commit(whereJson);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @PostMapping("/getDisDtl")
-    @Log("查询入库分配明细")
-    @ApiOperation("查询入库分配明细")
-    public ResponseEntity<Object> getDisDtl(@RequestBody JSONObject whereJson) {
-        return new ResponseEntity<>(productInService.getDisDtl(whereJson), HttpStatus.OK);
-    }
-
-    @PostMapping("/confirmvehicle")
-    @Log("组盘确认")
-    @ApiOperation("组盘确认")
-    public ResponseEntity<Object> confirmvehicle(@RequestBody JSONObject whereJson) {
-        productInService.confirmvehicle(whereJson);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @PostMapping("/divStruct")
-    @Log("分配货位")
-    @ApiOperation("分配货位")
-    public ResponseEntity<Object> divStruct(@RequestBody JSONObject whereJson) {
-        productInService.divStruct(whereJson);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @PostMapping("/unDivStruct")
-    @Log("取消分配货位")
-    @ApiOperation("取消分配货位")
-    public ResponseEntity<Object> unDivStruct(@RequestBody JSONObject whereJson) {
-        productInService.unDivStruct(whereJson);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @PostMapping("/divPoint")
-    @Log("设置起点")
-    @ApiOperation("设置起点")
-    public ResponseEntity<Object> divPoint(@RequestBody JSONObject whereJson) {
-        productInService.divPoint(whereJson);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @PostMapping("/delDis")
-    @Log("删除分配")
-    @ApiOperation("删除分配")
-    public ResponseEntity<Object> delDis(@RequestBody JSONObject whereJson) {
-        productInService.delDis(whereJson);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-    @PostMapping("/queryBoxMater")
-    @Log("查询箱内子卷")
-    @ApiOperation("查询箱内子卷")
-    public ResponseEntity<Object> queryBoxMater(@RequestBody JSONArray whereJson) {
-        return new ResponseEntity<>(productInService.queryBoxMater(whereJson), HttpStatus.OK);
-    }
-
-    @PostMapping("/updateTask")
-    @Log("变更任务")
-    @ApiOperation("变更任务")
-    public ResponseEntity<Object> updateTask(@RequestBody Map whereJson) {
-        productInService.updateTask(whereJson);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @PostMapping("/confirm")
-    @Log("完成单据")
-    @ApiOperation("完成单据")
-    public ResponseEntity<Object> confirm(@RequestBody Map whereJson) {
-        productInService.confirm(whereJson);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @PostMapping("/autoDis")
-    @Log("自动分配")
-    @ApiOperation("自动分配")
-    public ResponseEntity<Object> autoDis(@RequestBody JSONObject whereJson) {
-        productInService.autoDis(whereJson);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @PostMapping("/getDisTask")
-    @Log("获取明细任务")
-    @ApiOperation("获取明细任务")
-    public ResponseEntity<Object> getDisTask(@RequestBody JSONObject whereJson) {
-        return new ResponseEntity<>(productInService.getDisTask(whereJson),HttpStatus.OK);
-    }
-}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/StIvtIostorinvCpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/StIvtIostorinvCpController.java
deleted file mode 100644
index b9e03804..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/StIvtIostorinvCpController.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package org.nl.wms.storage_manage.productmanage.controller.iostorInv;
-
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.common.TableDataInfo;
-import org.nl.common.anno.Log;
-import org.nl.common.domain.query.PageQuery;
-import org.nl.wms.storage_manage.IOSEnum;
-import org.nl.wms.storage_manage.productmanage.service.iostorInv.IStIvtIostorinvCpService;
-import org.nl.wms.storage_manage.productmanage.service.iostorInv.dto.IostorInvQuery;
-import org.nl.wms.storage_manage.service.product.ProductInService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Pageable;
-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.Map;
-
-/**
- * <p>
- * 出入库单主表 前端控制器
- * </p>
- *
- * @author generator
- * @since 2023-05-04
- */
-@RestController
-@RequestMapping("/api/in/productIn")
-@Slf4j
-public class StIvtIostorinvCpController {
-
-    @Autowired
-    private IStIvtIostorinvCpService stIvtIostorinvCpService;
-    @Autowired
-    ProductInService productInService;
-
-
-    @GetMapping
-    @Log("查询入库单据")
-    @ApiOperation("查询入库单据")
-    public ResponseEntity<Object> query(IostorInvQuery query, PageQuery page) {
-        query.setIo_type(IOSEnum.IO_TYPE.code("入库"));
-        return new ResponseEntity<>(TableDataInfo.build(stIvtIostorinvCpService.page(page.build(), query.build())), HttpStatus.OK);
-    }
-
-    @Log("删除出入库单")
-    @ApiOperation("删除出入库单")
-    @DeleteMapping
-    public ResponseEntity<Object> delete(@Validated @RequestBody Long[] ids) {
-        stIvtIostorinvCpService.removeByIds(Arrays.asList(ids));
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-    @GetMapping("/getBillDtl")
-    @Log("查询入库单来源")
-    @ApiOperation("查询入库单来源")
-    public ResponseEntity<Object> getBillDtl(@RequestParam Map whereJson, Pageable page) {
-        return new ResponseEntity<>(productInService.getBillDtl(whereJson, page), HttpStatus.OK);
-    }
-
-    @PostMapping()
-    @Log("新增入库单")
-    @ApiOperation("新增入库单")
-    public ResponseEntity<Object> insertDtl(@RequestBody JSONObject whereJson) {
-        stIvtIostorinvCpService.create(whereJson);
-        return new ResponseEntity<>(HttpStatus.CREATED);
-    }
-
-    @PutMapping
-    @Log("修改入库单")
-    @ApiOperation("修改入库单")
-    public ResponseEntity<Object> update(@RequestBody JSONObject whereJson) {
-        productInService.update(whereJson);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @PostMapping("/queryStor")
-    @Log("查询仓库")
-    @ApiOperation("查询仓库")
-    public ResponseEntity<Object> queryStor() {
-        return new ResponseEntity<>(productInService.queryStor(), HttpStatus.OK);
-    }
-
-    @PostMapping("/getIODtl")
-    @Log("查询出入库单明细")
-    @ApiOperation("查询出入库单明细")
-    public ResponseEntity<Object> getIODtl(@RequestBody JSONObject whereJson) {
-        return new ResponseEntity<>(productInService.getIODtl(whereJson), HttpStatus.OK);
-    }
-
-    @PostMapping("/commit")
-    @Log("出入单提交")
-    @ApiOperation("出入单提交")
-    public ResponseEntity<Object> commit(@RequestBody Map whereJson) {
-        productInService.commit(whereJson);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @PostMapping("/getDisDtl")
-    @Log("查询入库分配明细")
-    @ApiOperation("查询入库分配明细")
-    public ResponseEntity<Object> getDisDtl(@RequestBody JSONObject whereJson) {
-        return new ResponseEntity<>(productInService.getDisDtl(whereJson), HttpStatus.OK);
-    }
-
-    @PostMapping("/confirmvehicle")
-    @Log("组盘确认")
-    @ApiOperation("组盘确认")
-    public ResponseEntity<Object> confirmvehicle(@RequestBody JSONObject whereJson) {
-        productInService.confirmvehicle(whereJson);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @PostMapping("/divStruct")
-    @Log("分配货位")
-    @ApiOperation("分配货位")
-    public ResponseEntity<Object> divStruct(@RequestBody JSONObject whereJson) {
-        productInService.divStruct(whereJson);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @PostMapping("/unDivStruct")
-    @Log("取消分配货位")
-    @ApiOperation("取消分配货位")
-    public ResponseEntity<Object> unDivStruct(@RequestBody JSONObject whereJson) {
-        productInService.unDivStruct(whereJson);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @PostMapping("/divPoint")
-    @Log("设置起点")
-    @ApiOperation("设置起点")
-    public ResponseEntity<Object> divPoint(@RequestBody JSONObject whereJson) {
-        productInService.divPoint(whereJson);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @PostMapping("/delDis")
-    @Log("删除分配")
-    @ApiOperation("删除分配")
-    public ResponseEntity<Object> delDis(@RequestBody JSONObject whereJson) {
-        productInService.delDis(whereJson);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-    @PostMapping("/queryBoxMater")
-    @Log("查询箱内子卷")
-    @ApiOperation("查询箱内子卷")
-    public ResponseEntity<Object> queryBoxMater(@RequestBody JSONArray whereJson) {
-        return new ResponseEntity<>(productInService.queryBoxMater(whereJson), HttpStatus.OK);
-    }
-
-    @PostMapping("/updateTask")
-    @Log("变更任务")
-    @ApiOperation("变更任务")
-    public ResponseEntity<Object> updateTask(@RequestBody Map whereJson) {
-        productInService.updateTask(whereJson);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @PostMapping("/confirm")
-    @Log("完成单据")
-    @ApiOperation("完成单据")
-    public ResponseEntity<Object> confirm(@RequestBody Map whereJson) {
-        productInService.confirm(whereJson);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @PostMapping("/autoDis")
-    @Log("自动分配")
-    @ApiOperation("自动分配")
-    public ResponseEntity<Object> autoDis(@RequestBody JSONObject whereJson) {
-        productInService.autoDis(whereJson);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @PostMapping("/getDisTask")
-    @Log("获取明细任务")
-    @ApiOperation("获取明细任务")
-    public ResponseEntity<Object> getDisTask(@RequestBody JSONObject whereJson) {
-        return new ResponseEntity<>(productInService.getDisTask(whereJson),HttpStatus.OK);
-    }
-
-}
-
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/StIvtIostorinvdisCpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/StIvtIostorinvdisCpController.java
deleted file mode 100644
index a193715b..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/StIvtIostorinvdisCpController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.nl.wms.storage_manage.productmanage.controller.iostorInv;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 出入库单分配表 前端控制器
- * </p>
- *
- * @author generator
- * @since 2023-05-04
- */
-@RestController
-@RequestMapping("/stIvtIostorinvdisCp")
-public class StIvtIostorinvdisCpController {
-
-}
-
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/StIvtIostorinvdtlCpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/StIvtIostorinvdtlCpController.java
deleted file mode 100644
index 91869783..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/StIvtIostorinvdtlCpController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.nl.wms.storage_manage.productmanage.controller.iostorInv;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 出入库单明细表 前端控制器
- * </p>
- *
- * @author generator
- * @since 2023-05-04
- */
-@RestController
-@RequestMapping("/stIvtIostorinvdtlCp")
-public class StIvtIostorinvdtlCpController {
-
-}
-
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvCpService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvCpService.java
index 82665cc3..b4a52103 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvCpService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvCpService.java
@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.wms.storage_manage.productmanage.service.iostorInv.dao.StIvtIostorinvCp;
 
+import java.util.List;
+
 /**
  * <p>
  * 出入库单主表 服务类
@@ -24,4 +26,24 @@ public interface IStIvtIostorinvCpService extends IService<StIvtIostorinvCp> {
      * @param form
      */
     void update(JSONObject form);
+
+    /**
+     *  查询出入库单明细
+     * @param whereJson /
+     * @return JSONArray
+     */
+    List getIosInvDtl(JSONObject whereJson);
+
+
+    /**
+     * 提交单据
+     * @param whereJson
+     */
+    void commit(JSONObject whereJson);
+
+    /**
+     * 组盘
+     * @param whereJson
+     */
+    void confirmvehicle(JSONObject whereJson);
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvdisCpService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvdisCpService.java
index 21d82d28..322db2cb 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvdisCpService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvdisCpService.java
@@ -5,6 +5,8 @@ import org.nl.wms.storage_manage.productmanage.service.iostorInv.dao.StIvtIostor
 import org.nl.wms.storage_manage.productmanage.service.iostorInv.dao.StIvtIostorinvdtlCp;
 
 import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,4 +23,5 @@ public interface IStIvtIostorinvdisCpService extends IService<StIvtIostorinvdisC
      */
     void batchInsert(Collection<StIvtIostorinvdisCp> list);
 
+    List queryInvDisByInvdtl(Map<String, Object> map);
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvdtlCpService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvdtlCpService.java
index 099f46f8..8535e424 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvdtlCpService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvdtlCpService.java
@@ -1,10 +1,13 @@
 package org.nl.wms.storage_manage.productmanage.service.iostorInv;
 
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.wms.storage_manage.productmanage.service.iostorInv.dao.StIvtIostorinvdtlCp;
 
 import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -25,9 +28,21 @@ public interface IStIvtIostorinvdtlCpService extends IService<StIvtIostorinvdtlC
     * 主单据使用
     * @param row
     * @param iostorinvCp_id
-    * @param total_qty
     * @return
     */
    double create(JSONArray row,String iostorinvCp_id);
 
+   /**
+    * 根据主单据查询明细
+    * @param map
+    * @return
+    */
+   List<Map> queryInvDtlByInv(Map<String,Object> map);
+
+   /**
+    * 查询出入库分配明细表
+    * @param map
+    * @return
+    */
+   List getDisDtl(Map<String, Object> map);
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/StIvtIostorinvCp.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/StIvtIostorinvCp.java
index 1609bc8f..7213e0e8 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/StIvtIostorinvCp.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/StIvtIostorinvCp.java
@@ -6,7 +6,6 @@ import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/StIvtIostorinvdisCpMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/StIvtIostorinvdisCpMapper.java
index f722f078..b56b3d38 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/StIvtIostorinvdisCpMapper.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/StIvtIostorinvdisCpMapper.java
@@ -5,6 +5,8 @@ import org.apache.ibatis.annotations.Param;
 import org.nl.wms.storage_manage.productmanage.service.iostorInv.dao.StIvtIostorinvdisCp;
 
 import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,4 +19,7 @@ import java.util.Collection;
 public interface StIvtIostorinvdisCpMapper extends BaseMapper<StIvtIostorinvdisCp> {
 
     Integer batchSave(@Param("entitys") Collection<StIvtIostorinvdisCp> entitys);
+
+    List<Map> queryInvDisByInvdtl(Map<String,Object> map);
+
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/StIvtIostorinvdtlCpMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/StIvtIostorinvdtlCpMapper.java
index aae1fdc2..cfcb2062 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/StIvtIostorinvdtlCpMapper.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/StIvtIostorinvdtlCpMapper.java
@@ -6,6 +6,8 @@ import org.nl.wms.storage_manage.productmanage.service.iostorInv.dao.StIvtIostor
 import org.nl.wms.storage_manage.productmanage.service.iostorInv.dao.StIvtIostorinvdtlCp;
 
 import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -19,4 +21,6 @@ public interface StIvtIostorinvdtlCpMapper extends BaseMapper<StIvtIostorinvdtlC
 
     Integer batchSave(@Param("entitys") Collection<StIvtIostorinvdtlCp> entitys);
 
+    List<Map> queryInvDtlByInv(Map<String,Object> map);
+
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvdisCpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvdisCpMapper.xml
index 32419adb..8d4353f2 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvdisCpMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvdisCpMapper.xml
@@ -65,4 +65,20 @@
             #{item.point_name})
         </foreach>
     </insert>
+    <select id="queryInvDisByInvdtl" resultType="java.util.Map">
+        SELECT
+            dis.*,
+            mater.material_code,
+            mater.material_name,
+            mater.material_spec,
+            dis.struct_code
+        FROM
+        st_ivt_iostorinvdis_cp dis
+        LEFT JOIN md_me_materialbase mater ON mater.material_id = dis.material_id
+        WHERE IFNULL(dis.task_id,'') = ''
+        <if test="iostorinvdtl_id != null and iostorinvdtl_id != ''">
+          and dis.iostorinvdtl_id = #{iostorinvdtl_id}
+        </if>
+        order by dis.seq_no ASC
+    </select>
 </mapper>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvdtlCpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvdtlCpMapper.xml
index 9fbac725..4bb2ebda 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvdtlCpMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvdtlCpMapper.xml
@@ -61,4 +61,24 @@
         </foreach>
 
     </insert>
+    <select id="queryInvDtlByInv" resultType="java.util.Map">
+        SELECT
+            dtl.*,
+            mater.material_code,
+            mater.material_name,
+            mater.material_spec
+        FROM
+            ST_IVT_IOStorInvDtl dtl
+            LEFT JOIN ST_IVT_IOStorInv mst ON mst.iostorinv_id = dtl.iostorinv_id
+            LEFT JOIN md_me_materialbase mater ON mater.material_id = dtl.material_id
+            WHERE mst.is_delete = '0'
+        <if test="bill_code != null and bill_code != ''">
+           AND mst.bill_code =#{bill_code}
+        </if>
+        <if test="iostorinv_id != null and iostorinv_id != ''">
+            AND mst.bill_code =#{iostorinv_id}
+        </if>
+        order by dtl.seq_no ASC
+
+    </select>
 </mapper>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java
index 898af1eb..b540319f 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java
@@ -1,25 +1,19 @@
 package org.nl.wms.storage_manage.productmanage.service.iostorInv.impl;
 
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.IdUtil;
-import com.alibaba.excel.util.CollectionUtils;
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import io.jsonwebtoken.lang.Assert;
-import net.dreamlu.mica.core.utils.BeanUtil;
-import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.nl.common.utils.SecurityUtils;
+import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.system.util.CodeUtil;
-import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
-import org.nl.wms.masterdata_manage.MasterEnum;
-import org.nl.wms.masterdata_manage.service.master.IMdPbMeasureunitService;
-import org.nl.wms.masterdata_manage.service.master.dao.MdPbMeasureunit;
-import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService;
-import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase;
 import org.nl.wms.storage_manage.IOSEnum;
 import org.nl.wms.storage_manage.productmanage.service.iostorInv.IStIvtIostorinvCpService;
 import org.nl.wms.storage_manage.productmanage.service.iostorInv.IStIvtIostorinvdisCpService;
@@ -34,7 +28,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -84,13 +77,59 @@ public class StIvtIostorinvCpServiceImpl extends ServiceImpl<StIvtIostorinvCpMap
         this.updateById(iostorinvCp);
     }
 
+
+    @Override
+    public List getIosInvDtl(JSONObject whereJson) {
+        List<Map> maps = iostorinvdtlCpService.queryInvDtlByInv(whereJson);
+        return maps;
+    }
+
+    @Override
+    public void commit(JSONObject whereJson) {
+        Assert.notNull(whereJson,"请求参数不能为空");
+        StIvtIostorinvCp mst = this.getById(whereJson.getString("iostorinv_id"));
+        if (!mst.getBill_status().equals(IOSEnum.BILL_STATUS.code("生成"))) {
+            throw new BadRequestException("请选择单据状态为生成的进行提交！");
+        }
+        mst.setBill_status(IOSEnum.BILL_STATUS.code("提交"));
+        mst.setUpdate_time(new Date());
+        mst.setUpdate_name(SecurityUtils.getCurrentNickName());
+        mst.setUpdate_id(SecurityUtils.getCurrentUserId());
+        this.updateById(mst);
+    }
+
+
+    @Override
+    public void confirmvehicle(JSONObject whereJson) {
+        WQLObject vehicleTab = WQLObject.getWQLObject("md_pb_storagevehicleinfo");
+        WQLObject vehicleMaterialTab = WQLObject.getWQLObject("md_pb_storagevehicleext");
+        WQLObject disTab = WQLObject.getWQLObject("st_ivt_iostorinvdis");
+        String storagevehicle_code = whereJson.getString("storagevehicle_code");
+        // 校验载具是否存在
+        JSONObject jsonVehicle = vehicleTab.query("storagevehicle_code = '" + storagevehicle_code + "' and is_delete = '0' and is_used = '1'").uniqueResult(0);
+        if (ObjectUtil.isEmpty(jsonVehicle)) throw new BadRequestException("载具不存在");
+        JSONArray vehicleMaterial = vehicleMaterialTab.query("storagevehicle_code = '" + storagevehicle_code + "' and material_id IS not NULL ").getResultJSONArray(0);
+        if (vehicleMaterial.size()>0){
+            throw new BadRequestException("载具已被占用");
+        }
+        // 更新分配明细载具号
+        JSONObject jsonDis = disTab.query("iostorinvdis_id = '" + whereJson.getString("iostorinvdis_id") + "'").uniqueResult(0);
+        // 校验此明细是否已经分配
+        if (ObjectUtil.isNotEmpty(jsonDis.getString("struct_id"))) {
+            throw new BadRequestException("此明细已分配不可组盘！");
+        }
+        jsonDis.put("storagevehicle_id", jsonVehicle.getString("storagevehicle_id"));
+        jsonDis.put("storagevehicle_code", jsonVehicle.getString("storagevehicle_code"));
+        disTab.update(jsonDis);
+    }
+
     @NotNull
     private void packageMstForm(StIvtIostorinvCp stIvtIostorinvCp,JSONObject whereJson,Boolean isUpdate) {
         JSONArray rows = whereJson.getJSONArray("tableData");
         if (!isUpdate){
             stIvtIostorinvCp.setIostorinv_id(org.nl.common.utils.IdUtil.getStringId());
             stIvtIostorinvCp.setBill_code(CodeUtil.getNewCode("IO_CODE"));
-            stIvtIostorinvCp.setBill_status(IOSEnum.BILL_STATUS.code("创建"));
+            stIvtIostorinvCp.setBill_status(IOSEnum.BILL_STATUS.code("生成"));
             stIvtIostorinvCp.setCreate_id(SecurityUtils.getCurrentUserId());
             stIvtIostorinvCp.setCreate_name(SecurityUtils.getCurrentNickName());
             stIvtIostorinvCp.setCreate_time(new Date());
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvdisCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvdisCpServiceImpl.java
index 85f4c747..49867a20 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvdisCpServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvdisCpServiceImpl.java
@@ -8,6 +8,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -26,4 +28,9 @@ public class StIvtIostorinvdisCpServiceImpl extends ServiceImpl<StIvtIostorinvdi
             baseMapper.batchSave(list);
         }
     }
+
+    @Override
+    public List queryInvDisByInvdtl(Map<String, Object> map) {
+       return baseMapper.queryInvDisByInvdtl(map);
+    }
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvdtlCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvdtlCpServiceImpl.java
index b6aa8a25..d9d6b35b 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvdtlCpServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvdtlCpServiceImpl.java
@@ -1,11 +1,12 @@
 package org.nl.wms.storage_manage.productmanage.service.iostorInv.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import net.dreamlu.mica.core.utils.BeanUtil;
 import org.apache.commons.lang3.StringUtils;
+import org.nl.modules.wql.WQL;
 import org.nl.wms.masterdata_manage.MasterEnum;
 import org.nl.wms.masterdata_manage.service.master.IMdPbMeasureunitService;
 import org.nl.wms.masterdata_manage.service.master.dao.MdPbMeasureunit;
@@ -73,7 +74,7 @@ public class StIvtIostorinvdtlCpServiceImpl extends ServiceImpl<StIvtIostorinvdt
                 MdMeMaterialbase material = materialMap.get(row.get("material_code"));
                 iostorinvdtlCp.setMaterial_id(material.getMaterial_id());
                 iostorinvdtlCp.setPcsn(row.getString("pcsn"));
-                iostorinvdtlCp.setBill_status(IOSEnum.BILL_STATUS.code("创建"));
+                iostorinvdtlCp.setBill_status(IOSEnum.BILL_STATUS.code("生成"));
                 iostorinvdtlCp.setQuality_scode(MasterEnum.MATERIAL_QUALITY.code("一等品"));
                 iostorinvdtlCp.setQty_unit_id(material.getBase_unit_id());
                 iostorinvdtlCp.setQty_unit_name(measureUnitMap.get(material.getBase_unit_id()));
@@ -85,7 +86,7 @@ public class StIvtIostorinvdtlCpServiceImpl extends ServiceImpl<StIvtIostorinvdt
                     total_qty += Double.parseDouble(tmp_plan_qty);
                 }
                 //分配表
-                StIvtIostorinvdisCp stIvtIostorinvdisCp = BeanUtil.copy(iostorinvdtlCp, StIvtIostorinvdisCp.class);
+                StIvtIostorinvdisCp stIvtIostorinvdisCp = BeanUtil.copyProperties(iostorinvdtlCp, StIvtIostorinvdisCp.class);
                 stIvtIostorinvdisCp.setIostorinvdis_id(org.nl.common.utils.IdUtil.getStringId());
                 stIvtIostorinvdisCp.setSeq_no(1);
                 stIvtIostorinvdisCp.setWork_status(IOSEnum.WORK_STATUS.code("创建"));
@@ -98,4 +99,16 @@ public class StIvtIostorinvdtlCpServiceImpl extends ServiceImpl<StIvtIostorinvdt
         }
         return total_qty;
     }
+
+    @Override
+    public List<Map> queryInvDtlByInv(Map<String, Object> map) {
+       return baseMapper.queryInvDtlByInv(map);
+    }
+
+    @Override
+    public List getDisDtl(Map<String, Object> map) {
+        //查询该明细下的所有入库分配明细
+       return iostorinvdisCpService.queryInvDisByInvdtl(map);
+
+    }
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/wql/QST_IVT_PRODUCTIN_01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/wql/QST_IVT_PRODUCTIN_01.wql
index 05da7cf9..8e1f402b 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/wql/QST_IVT_PRODUCTIN_01.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/wql/QST_IVT_PRODUCTIN_01.wql
@@ -123,7 +123,7 @@
                     point.point_code
                 FROM
                     ST_IVT_IOStorInvDis dis
-                    LEFT JOIN sch_base_point point ON point.point_id = dis.point_id
+                    LEFT JOIN st_ivt_structattr struc ON point.point_id = dis.point_id
                     LEFT JOIN md_me_materialbase mater ON mater.material_id = dis.material_id
                 WHERE
                     IFNULL(dis.task_id,'') = ''
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/controller/semiproduct/SemiProductInController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/SemiProductInController.java
similarity index 99%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/controller/semiproduct/SemiProductInController.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/SemiProductInController.java
index c7f79030..13051473 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/controller/semiproduct/SemiProductInController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/SemiProductInController.java
@@ -1,4 +1,4 @@
-package org.nl.wms.storage_manage.controller.semiproduct;
+package org.nl.wms.storage_manage.semimanage.controller;
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import com.alibaba.fastjson.JSONArray;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/controller/semiproduct/SemiProductOutController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/SemiProductOutController.java
similarity index 99%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/controller/semiproduct/SemiProductOutController.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/SemiProductOutController.java
index f67c09d5..6ae092bf 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/controller/semiproduct/SemiProductOutController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/SemiProductOutController.java
@@ -1,4 +1,4 @@
-package org.nl.wms.storage_manage.controller.semiproduct;
+package org.nl.wms.storage_manage.semimanage.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/stivt.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/stivt.xls
index 39f9fcee..bc1cde00 100644
Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/stivt.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/stivt.xls differ
diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml b/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml
index 86ba9ddd..786855b8 100644
--- a/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml
+++ b/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml
@@ -23,11 +23,12 @@ spring:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
       #url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
-      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
+      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
+#      username: ${DB_USER:root}
+#      password: ${DB_PWD:Root.123456}
       username: ${DB_USER:root}
-      #password: ${DB_PWD:P@ssw0rd}
-      #password: ${DB_PWD:root}
-      password: ${DB_PWD:Root.123456}
+      password: ${DB_PWD:942464Yy}
+
       # 初始连接数
       initial-size: 5
       # 最小连接数