From 055ecfc4003e7e7da3418dcc3222f13820f207ef Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Wed, 10 May 2023 10:54:36 +0800
Subject: [PATCH] =?UTF-8?q?add:=E4=B8=BB=E6=95=B0=E6=8D=AE=E8=BD=BD?=
 =?UTF-8?q?=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/wms/masterdata_manage/mdpb.xls     | Bin 192512 -> 192512 bytes
 .../common/enums/MaterialEnum.java            |   2 +-
 .../constant/MaterOptTypeEnum.java            |   2 +-
 .../eum/BusinessCodeEnum.java                 |   2 +-
 .../eum/RecordStatusEnum.java                 |   2 +-
 .../manage/AbstructMaterialType.java          |   2 +-
 .../rest/ClassstandardController.java         |   6 +-
 .../rest/CustomerbaseController.java          |   6 +-
 .../rest/MaterialbaseController.java          |   8 +-
 .../rest/SemirealrawmaterialController.java   |   6 +-
 .../rest/StoragevehicleinfoController.java    |   6 +-
 .../rest/SupplierbaseController.java          |   6 +-
 .../rest/UnitController.java                  |   6 +-
 .../service/ClassstandardService.java         |   4 +-
 .../service/CustomerbaseService.java          |   4 +-
 .../service/MaterialbaseService.java          |   4 +-
 .../service/SemirealrawmaterialService.java   |   4 +-
 .../service/StoragevehicleinfoService.java    |   4 +-
 .../service/SupplierbaseService.java          |   4 +-
 .../service/UnitService.java                  |   4 +-
 .../service/dto/BusinesstypematerialDto.java  |   2 +-
 .../service/dto/ClassstandardDto.java         |   2 +-
 .../service/dto/CustomerbaseDto.java          |   2 +-
 .../service/dto/EndrealsemimaterialDto.java   |   2 +-
 .../service/dto/MaterialParametersDto.java    |   2 +-
 .../service/dto/MaterialbaseDto.java          |   2 +-
 .../service/dto/SemirealrawmaterialDto.java   |   2 +-
 .../service/dto/StoragevehicleinfoDto.java    |   2 +-
 .../service/dto/SupplierbaseDto.java          |   2 +-
 .../service/dto/UnitDto.java                  |   2 +-
 .../impl/ClassstandardServiceImpl.java        |   6 +-
 .../service/impl/CustomerbaseServiceImpl.java |  10 +-
 .../service/impl/MaterialbaseServiceImpl.java |  10 +-
 .../impl/SemirealrawmaterialServiceImpl.java  |   6 +-
 .../impl/StoragevehicleinfoServiceImpl.java   |   6 +-
 .../service/impl/SupplierbaseServiceImpl.java |  10 +-
 .../service/impl/UnitServiceImpl.java         |   6 +-
 .../wql/QMD_ME_ENDREALRAWMATERIAL001.wql      |   0
 .../wql/QMD_ME_MATERIAL.wql                   |   0
 .../wql/QMD_ME_SEMIREALRAWMATERIAL001.wql     |   0
 .../wql/QMD_ME_material_param01.wql           |   0
 .../wql/QMD_PB_BUSINESSTYPEMATERIAL.wql       |   0
 .../wql/QMD_PB_CLASSBASE.wql                  |   0
 .../wql/QMD_PB_STORAGEVEHICLEEXT.wql          |   0
 .../wql/QMD_PB_STORAGEVEHICLEINFO.wql         |   0
 .../wql/QMD_PB_STORAGEVEHICLEPOINT.wql        |   0
 .../wql/QMD_STORAGEVEHICLECLEANING.wql        |   0
 .../wql/QMT_MATERIALPARAMETERS_001.wql        |   0
 .../rest/WorkProcedureController.java         |   7 +-
 .../service/WorkProcedureService.java         |   4 +-
 .../service/dto/WorkProcedureDto.java         |   2 +-
 .../impl/WorkProcedureServiceImpl.java        |   6 +-
 .../{st => 备份st}/IvtChangeTypeEnum.java   |   2 +-
 .../{st => 备份st}/StoreIvtServiceImpl.java |   2 +-
 .../rest/MaterialsafeivtController.java       |   6 +-
 .../rest/SectattrController.java              |   6 +-
 .../rest/StorattrController.java              |   6 +-
 .../rest/StructattrController.java            |   6 +-
 .../rest/StructivtController.java             |   6 +-
 .../rest/StructrelamaterialController.java    |   6 +-
 .../rest/StructrelavehicletypeController.java |   4 +-
 .../service/MaterialsafeivtService.java       |   4 +-
 .../service/SectattrService.java              |   4 +-
 .../service/StorattrService.java              |   4 +-
 .../service/StructattrService.java            |   4 +-
 .../service/StructivtService.java             |   4 +-
 .../service/StructrelamaterialService.java    |   4 +-
 .../service/StructrelavehicletypeService.java |   4 +-
 .../service/dto/MaterialsafeivtDto.java       |   2 +-
 .../service/dto/SectattrDto.java              |   2 +-
 .../service/dto/StorattrDto.java              |   2 +-
 .../service/dto/StructattrDto.java            |   2 +-
 .../service/dto/StructivtDto.java             |   2 +-
 .../service/dto/StructrelamaterialDto.java    |   2 +-
 .../service/dto/StructrelavehicletypeDto.java |   2 +-
 .../impl/MaterialsafeivtServiceImpl.java      |   8 +-
 .../service/impl/SectattrServiceImpl.java     |  10 +-
 .../service/impl/StorattrServiceImpl.java     |   6 +-
 .../service/impl/StructattrServiceImpl.java   |  14 +--
 .../service/impl/StructivtServiceImpl.java    |   8 +-
 .../impl/StructrelamaterialServiceImpl.java   |   8 +-
 .../StructrelavehicletypeServiceImpl.java     |   6 +-
 .../{st => 备份st}/wql/QLK01.wql            |   0
 .../wql/QST_IVT_MATERIALSAFE.wql              |   0
 .../wql/QST_IVT_MATERIALSET.wql               |   0
 .../{st => 备份st}/wql/QST_SECT_ATTR.wql    |   0
 .../{st => 备份st}/wql/QST_STOR_ATTR.wql    |   0
 .../{st => 备份st}/wql/QST_STRUCTIVT001.wql |   0
 .../{st => 备份st}/wql/QST_STRUCT_ATTR.wql  |   0
 .../wql/ST_Structrelavehicletype_01.wql       |   0
 .../{st => 备份st}/wql/stivt.xls            | Bin
 .../semiproduct/semiProductIn/AddDialog.vue   |  28 ++---
 .../semiproduct/semiProductIn/AddDtl.vue      |   4 +-
 .../semiproduct/semiProductIn/DivDialog.vue   |  36 +++---
 .../semiproduct/semiProductIn/ViewDialog.vue  |   6 +-
 .../semiproduct/semiProductIn/index.vue       | 106 ++++++++++++------
 .../semiproduct/semiProductOut/AddDialog.vue  |  10 +-
 .../semiproduct/semiProductOut/DivDialog.vue  |  24 ++--
 .../semiproduct/semiProductOut/ViewDialog.vue |  10 +-
 .../semiproduct/semiProductOut/index.vue      |  20 ++--
 100 files changed, 301 insertions(+), 264 deletions(-)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/common/enums/MaterialEnum.java (94%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/constant/MaterOptTypeEnum.java (97%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/eum/BusinessCodeEnum.java (90%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/eum/RecordStatusEnum.java (90%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/manage/AbstructMaterialType.java (71%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/rest/ClassstandardController.java (95%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/rest/CustomerbaseController.java (90%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/rest/MaterialbaseController.java (92%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/rest/SemirealrawmaterialController.java (90%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/rest/StoragevehicleinfoController.java (92%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/rest/SupplierbaseController.java (89%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/rest/UnitController.java (92%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/service/ClassstandardService.java (94%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/service/CustomerbaseService.java (89%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/service/MaterialbaseService.java (93%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/service/SemirealrawmaterialService.java (89%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/service/StoragevehicleinfoService.java (91%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/service/SupplierbaseService.java (89%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/service/UnitService.java (89%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/service/dto/BusinesstypematerialDto.java (96%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/service/dto/ClassstandardDto.java (94%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/service/dto/CustomerbaseDto.java (96%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/service/dto/EndrealsemimaterialDto.java (94%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/service/dto/MaterialParametersDto.java (96%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/service/dto/MaterialbaseDto.java (96%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/service/dto/SemirealrawmaterialDto.java (94%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/service/dto/StoragevehicleinfoDto.java (95%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/service/dto/SupplierbaseDto.java (96%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/service/dto/UnitDto.java (91%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/service/impl/ClassstandardServiceImpl.java (99%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/service/impl/CustomerbaseServiceImpl.java (93%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/service/impl/MaterialbaseServiceImpl.java (98%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/service/impl/SemirealrawmaterialServiceImpl.java (95%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/service/impl/StoragevehicleinfoServiceImpl.java (97%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/service/impl/SupplierbaseServiceImpl.java (94%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/service/impl/UnitServiceImpl.java (96%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/wql/QMD_ME_ENDREALRAWMATERIAL001.wql (100%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/wql/QMD_ME_MATERIAL.wql (100%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/wql/QMD_ME_SEMIREALRAWMATERIAL001.wql (100%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/wql/QMD_ME_material_param01.wql (100%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/wql/QMD_PB_BUSINESSTYPEMATERIAL.wql (100%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/wql/QMD_PB_CLASSBASE.wql (100%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/wql/QMD_PB_STORAGEVEHICLEEXT.wql (100%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/wql/QMD_PB_STORAGEVEHICLEINFO.wql (100%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/wql/QMD_PB_STORAGEVEHICLEPOINT.wql (100%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/wql/QMD_STORAGEVEHICLECLEANING.wql (100%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{master => 备份master}/wql/QMT_MATERIALPARAMETERS_001.wql (100%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{pdm => 备份pdm}/rest/WorkProcedureController.java (92%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{pdm => 备份pdm}/service/WorkProcedureService.java (92%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{pdm => 备份pdm}/service/dto/WorkProcedureDto.java (94%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{pdm => 备份pdm}/service/impl/WorkProcedureServiceImpl.java (96%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/IvtChangeTypeEnum.java (93%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/StoreIvtServiceImpl.java (99%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/rest/MaterialsafeivtController.java (92%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/rest/SectattrController.java (93%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/rest/StorattrController.java (93%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/rest/StructattrController.java (92%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/rest/StructivtController.java (93%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/rest/StructrelamaterialController.java (93%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/rest/StructrelavehicletypeController.java (94%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/service/MaterialsafeivtService.java (89%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/service/SectattrService.java (90%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/service/StorattrService.java (90%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/service/StructattrService.java (90%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/service/StructivtService.java (91%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/service/StructrelamaterialService.java (90%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/service/StructrelavehicletypeService.java (90%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/service/dto/MaterialsafeivtDto.java (93%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/service/dto/SectattrDto.java (97%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/service/dto/StorattrDto.java (97%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/service/dto/StructattrDto.java (98%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/service/dto/StructivtDto.java (96%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/service/dto/StructrelamaterialDto.java (92%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/service/dto/StructrelavehicletypeDto.java (93%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/service/impl/MaterialsafeivtServiceImpl.java (95%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/service/impl/SectattrServiceImpl.java (96%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/service/impl/StorattrServiceImpl.java (97%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/service/impl/StructattrServiceImpl.java (95%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/service/impl/StructivtServiceImpl.java (96%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/service/impl/StructrelamaterialServiceImpl.java (95%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/service/impl/StructrelavehicletypeServiceImpl.java (97%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/wql/QLK01.wql (100%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/wql/QST_IVT_MATERIALSAFE.wql (100%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/wql/QST_IVT_MATERIALSET.wql (100%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/wql/QST_SECT_ATTR.wql (100%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/wql/QST_STOR_ATTR.wql (100%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/wql/QST_STRUCTIVT001.wql (100%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/wql/QST_STRUCT_ATTR.wql (100%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/wql/ST_Structrelavehicletype_01.wql (100%)
 rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{st => 备份st}/wql/stivt.xls (100%)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/mdpb.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/mdpb.xls
index 0e985b4af0f2e35e27f8ded3b6cbb618892e1ebf..5160d33169f373b43cf524f44aa64941559631df 100644
GIT binary patch
delta 43
zcmZp8z}@hGdqWNjn}OPT?UzlPi&(Y^a<DQm7+RQFm^2%RwHt^rZZ{BPx^NQ!NQn*K

delta 43
zcmZp8z}@hGdqWNj+XX$ZlgZ_qi&(Y^axgP6Mi&_t2{s#uwHt^rZZ{BPx^NQ!Tk{U2

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/common/enums/MaterialEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/common/enums/MaterialEnum.java
similarity index 94%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/common/enums/MaterialEnum.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/common/enums/MaterialEnum.java
index 171c4885..f4e4b865 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/common/enums/MaterialEnum.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/common/enums/MaterialEnum.java
@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.master.common.enums;
+package org.nl.wms.masterdata_manage.备份master.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/constant/MaterOptTypeEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/constant/MaterOptTypeEnum.java
similarity index 97%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/constant/MaterOptTypeEnum.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/constant/MaterOptTypeEnum.java
index 71403b8d..ff3a72ea 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/constant/MaterOptTypeEnum.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/constant/MaterOptTypeEnum.java
@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.master.constant;
+package org.nl.wms.masterdata_manage.备份master.constant;
 
 import com.alibaba.fastjson.JSONObject;
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/eum/BusinessCodeEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/eum/BusinessCodeEnum.java
similarity index 90%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/eum/BusinessCodeEnum.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/eum/BusinessCodeEnum.java
index c182fa96..05a47935 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/eum/BusinessCodeEnum.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/eum/BusinessCodeEnum.java
@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.master.eum;
+package org.nl.wms.masterdata_manage.备份master.eum;
 
 public enum BusinessCodeEnum {
     STOCK_IN(1,"10","入库"),
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/eum/RecordStatusEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/eum/RecordStatusEnum.java
similarity index 90%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/eum/RecordStatusEnum.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/eum/RecordStatusEnum.java
index 8ebc4a29..24149695 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/eum/RecordStatusEnum.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/eum/RecordStatusEnum.java
@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.master.eum;
+package org.nl.wms.masterdata_manage.备份master.eum;
 
 public enum RecordStatusEnum {
     CREATE(1,"01","生成"),
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/manage/AbstructMaterialType.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/manage/AbstructMaterialType.java
similarity index 71%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/manage/AbstructMaterialType.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/manage/AbstructMaterialType.java
index 00d3316b..881a503b 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/manage/AbstructMaterialType.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/manage/AbstructMaterialType.java
@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.master.manage;
+package org.nl.wms.masterdata_manage.备份master.manage;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/rest/ClassstandardController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/ClassstandardController.java
similarity index 95%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/rest/ClassstandardController.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/ClassstandardController.java
index c7f3bb0e..85f7549b 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/rest/ClassstandardController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/ClassstandardController.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.masterdata_manage.master.rest;
+package org.nl.wms.masterdata_manage.备份master.rest;
 
 
 import cn.hutool.core.map.MapUtil;
@@ -11,8 +11,8 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.anno.Log;
 import org.nl.modules.wql.core.bean.WQLObject;
-import org.nl.wms.masterdata_manage.master.service.ClassstandardService;
-import org.nl.wms.masterdata_manage.master.service.dto.ClassstandardDto;
+import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
+import org.nl.wms.masterdata_manage.备份master.service.dto.ClassstandardDto;
 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/masterdata_manage/master/rest/CustomerbaseController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/CustomerbaseController.java
similarity index 90%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/rest/CustomerbaseController.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/CustomerbaseController.java
index 7c36f722..f848a2e5 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/rest/CustomerbaseController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/CustomerbaseController.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.masterdata_manage.master.rest;
+package org.nl.wms.masterdata_manage.备份master.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.masterdata_manage.master.service.CustomerbaseService;
-import org.nl.wms.masterdata_manage.master.service.dto.CustomerbaseDto;
+import org.nl.wms.masterdata_manage.备份master.service.CustomerbaseService;
+import org.nl.wms.masterdata_manage.备份master.service.dto.CustomerbaseDto;
 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/masterdata_manage/master/rest/MaterialbaseController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/MaterialbaseController.java
similarity index 92%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/rest/MaterialbaseController.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/MaterialbaseController.java
index 4d9f6535..61740bb4 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/rest/MaterialbaseController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/MaterialbaseController.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.masterdata_manage.master.rest;
+package org.nl.wms.masterdata_manage.备份master.rest;
 
 
 import cn.hutool.core.map.MapUtil;
@@ -9,9 +9,9 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.wms.masterdata_manage.master.constant.MaterOptTypeEnum;
-import org.nl.wms.masterdata_manage.master.service.MaterialbaseService;
-import org.nl.wms.masterdata_manage.master.service.dto.MaterialbaseDto;
+import org.nl.wms.masterdata_manage.备份master.constant.MaterOptTypeEnum;
+import org.nl.wms.masterdata_manage.备份master.service.MaterialbaseService;
+import org.nl.wms.masterdata_manage.备份master.service.dto.MaterialbaseDto;
 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/masterdata_manage/master/rest/SemirealrawmaterialController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/SemirealrawmaterialController.java
similarity index 90%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/rest/SemirealrawmaterialController.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/SemirealrawmaterialController.java
index dadc6295..af1d4ec5 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/rest/SemirealrawmaterialController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/SemirealrawmaterialController.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.masterdata_manage.master.rest;
+package org.nl.wms.masterdata_manage.备份master.rest;
 
 
 import com.alibaba.fastjson.JSONObject;
@@ -8,8 +8,8 @@ import io.swagger.annotations.ApiOperation;
  import lombok.RequiredArgsConstructor;
 import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.wms.masterdata_manage.master.service.SemirealrawmaterialService;
-import org.nl.wms.masterdata_manage.master.service.dto.SemirealrawmaterialDto;
+import org.nl.wms.masterdata_manage.备份master.service.SemirealrawmaterialService;
+import org.nl.wms.masterdata_manage.备份master.service.dto.SemirealrawmaterialDto;
 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/masterdata_manage/master/rest/StoragevehicleinfoController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/StoragevehicleinfoController.java
similarity index 92%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/rest/StoragevehicleinfoController.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/StoragevehicleinfoController.java
index 2756e458..0e0c967e 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/rest/StoragevehicleinfoController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/StoragevehicleinfoController.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.masterdata_manage.master.rest;
+package org.nl.wms.masterdata_manage.备份master.rest;
 
 
 import com.alibaba.fastjson.JSONObject;
@@ -8,8 +8,8 @@ import io.swagger.annotations.ApiOperation;
  import lombok.RequiredArgsConstructor;
 import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.wms.masterdata_manage.master.service.StoragevehicleinfoService;
-import org.nl.wms.masterdata_manage.master.service.dto.StoragevehicleinfoDto;
+import org.nl.wms.masterdata_manage.备份master.service.StoragevehicleinfoService;
+import org.nl.wms.masterdata_manage.备份master.service.dto.StoragevehicleinfoDto;
 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/masterdata_manage/master/rest/SupplierbaseController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/SupplierbaseController.java
similarity index 89%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/rest/SupplierbaseController.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/SupplierbaseController.java
index af5ec27f..a3172aa9 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/rest/SupplierbaseController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/SupplierbaseController.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.masterdata_manage.master.rest;
+package org.nl.wms.masterdata_manage.备份master.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.masterdata_manage.master.service.SupplierbaseService;
-import org.nl.wms.masterdata_manage.master.service.dto.SupplierbaseDto;
+import org.nl.wms.masterdata_manage.备份master.service.SupplierbaseService;
+import org.nl.wms.masterdata_manage.备份master.service.dto.SupplierbaseDto;
 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/masterdata_manage/master/rest/UnitController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/UnitController.java
similarity index 92%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/rest/UnitController.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/UnitController.java
index cdce6209..a8aa427d 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/rest/UnitController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/UnitController.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.masterdata_manage.master.rest;
+package org.nl.wms.masterdata_manage.备份master.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.masterdata_manage.master.service.UnitService;
-import org.nl.wms.masterdata_manage.master.service.dto.UnitDto;
+import org.nl.wms.masterdata_manage.备份master.service.UnitService;
+import org.nl.wms.masterdata_manage.备份master.service.dto.UnitDto;
 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/masterdata_manage/master/service/ClassstandardService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/ClassstandardService.java
similarity index 94%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/ClassstandardService.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/ClassstandardService.java
index 2b90c48e..49cb6ce8 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/ClassstandardService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/ClassstandardService.java
@@ -1,9 +1,9 @@
 
-package org.nl.wms.masterdata_manage.master.service;
+package org.nl.wms.masterdata_manage.备份master.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import org.nl.wms.masterdata_manage.master.service.dto.ClassstandardDto;
+import org.nl.wms.masterdata_manage.备份master.service.dto.ClassstandardDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/CustomerbaseService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/CustomerbaseService.java
similarity index 89%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/CustomerbaseService.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/CustomerbaseService.java
index 0dbd0f28..e395f5c5 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/CustomerbaseService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/CustomerbaseService.java
@@ -1,7 +1,7 @@
 
-package org.nl.wms.masterdata_manage.master.service;
+package org.nl.wms.masterdata_manage.备份master.service;
 
-import org.nl.wms.masterdata_manage.master.service.dto.CustomerbaseDto;
+import org.nl.wms.masterdata_manage.备份master.service.dto.CustomerbaseDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/MaterialbaseService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/MaterialbaseService.java
similarity index 93%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/MaterialbaseService.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/MaterialbaseService.java
index 6f24e245..300b826f 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/MaterialbaseService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/MaterialbaseService.java
@@ -1,9 +1,9 @@
 
-package org.nl.wms.masterdata_manage.master.service;
+package org.nl.wms.masterdata_manage.备份master.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import org.nl.wms.masterdata_manage.master.service.dto.MaterialbaseDto;
+import org.nl.wms.masterdata_manage.备份master.service.dto.MaterialbaseDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/SemirealrawmaterialService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/SemirealrawmaterialService.java
similarity index 89%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/SemirealrawmaterialService.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/SemirealrawmaterialService.java
index e2251389..b28736d4 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/SemirealrawmaterialService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/SemirealrawmaterialService.java
@@ -1,8 +1,8 @@
 
-package org.nl.wms.masterdata_manage.master.service;
+package org.nl.wms.masterdata_manage.备份master.service;
 
 import com.alibaba.fastjson.JSONObject;
-import org.nl.wms.masterdata_manage.master.service.dto.SemirealrawmaterialDto;
+import org.nl.wms.masterdata_manage.备份master.service.dto.SemirealrawmaterialDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/StoragevehicleinfoService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/StoragevehicleinfoService.java
similarity index 91%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/StoragevehicleinfoService.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/StoragevehicleinfoService.java
index 0f2a65f0..19062144 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/StoragevehicleinfoService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/StoragevehicleinfoService.java
@@ -1,9 +1,9 @@
 
-package org.nl.wms.masterdata_manage.master.service;
+package org.nl.wms.masterdata_manage.备份master.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import org.nl.wms.masterdata_manage.master.service.dto.StoragevehicleinfoDto;
+import org.nl.wms.masterdata_manage.备份master.service.dto.StoragevehicleinfoDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/SupplierbaseService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/SupplierbaseService.java
similarity index 89%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/SupplierbaseService.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/SupplierbaseService.java
index 9ae86743..98997f58 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/SupplierbaseService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/SupplierbaseService.java
@@ -1,7 +1,7 @@
 
-package org.nl.wms.masterdata_manage.master.service;
+package org.nl.wms.masterdata_manage.备份master.service;
 
-import org.nl.wms.masterdata_manage.master.service.dto.SupplierbaseDto;
+import org.nl.wms.masterdata_manage.备份master.service.dto.SupplierbaseDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/UnitService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/UnitService.java
similarity index 89%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/UnitService.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/UnitService.java
index d901af24..e2b2397d 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/UnitService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/UnitService.java
@@ -1,8 +1,8 @@
 
-package org.nl.wms.masterdata_manage.master.service;
+package org.nl.wms.masterdata_manage.备份master.service;
 
 import com.alibaba.fastjson.JSONObject;
-import org.nl.wms.masterdata_manage.master.service.dto.UnitDto;
+import org.nl.wms.masterdata_manage.备份master.service.dto.UnitDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/dto/BusinesstypematerialDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/BusinesstypematerialDto.java
similarity index 96%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/dto/BusinesstypematerialDto.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/BusinesstypematerialDto.java
index 30de9965..a9db8a27 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/dto/BusinesstypematerialDto.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/BusinesstypematerialDto.java
@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.master.service.dto;
+package org.nl.wms.masterdata_manage.备份master.service.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/dto/ClassstandardDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/ClassstandardDto.java
similarity index 94%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/dto/ClassstandardDto.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/ClassstandardDto.java
index 9379abf5..975c6278 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/dto/ClassstandardDto.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/ClassstandardDto.java
@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.master.service.dto;
+package org.nl.wms.masterdata_manage.备份master.service.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/dto/CustomerbaseDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/CustomerbaseDto.java
similarity index 96%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/dto/CustomerbaseDto.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/CustomerbaseDto.java
index 7d0a58dc..166ba38c 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/dto/CustomerbaseDto.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/CustomerbaseDto.java
@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.master.service.dto;
+package org.nl.wms.masterdata_manage.备份master.service.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/dto/EndrealsemimaterialDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/EndrealsemimaterialDto.java
similarity index 94%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/dto/EndrealsemimaterialDto.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/EndrealsemimaterialDto.java
index 9a50035d..05adea8f 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/dto/EndrealsemimaterialDto.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/EndrealsemimaterialDto.java
@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.master.service.dto;
+package org.nl.wms.masterdata_manage.备份master.service.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/dto/MaterialParametersDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/MaterialParametersDto.java
similarity index 96%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/dto/MaterialParametersDto.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/MaterialParametersDto.java
index b93b0f80..64dbe37c 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/dto/MaterialParametersDto.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/MaterialParametersDto.java
@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.master.service.dto;
+package org.nl.wms.masterdata_manage.备份master.service.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/dto/MaterialbaseDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/MaterialbaseDto.java
similarity index 96%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/dto/MaterialbaseDto.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/MaterialbaseDto.java
index 510619b6..1720ab47 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/dto/MaterialbaseDto.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/MaterialbaseDto.java
@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.master.service.dto;
+package org.nl.wms.masterdata_manage.备份master.service.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/dto/SemirealrawmaterialDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/SemirealrawmaterialDto.java
similarity index 94%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/dto/SemirealrawmaterialDto.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/SemirealrawmaterialDto.java
index 8ed10154..71266161 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/dto/SemirealrawmaterialDto.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/SemirealrawmaterialDto.java
@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.master.service.dto;
+package org.nl.wms.masterdata_manage.备份master.service.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/dto/StoragevehicleinfoDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/StoragevehicleinfoDto.java
similarity index 95%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/dto/StoragevehicleinfoDto.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/StoragevehicleinfoDto.java
index 859d843c..615e0967 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/dto/StoragevehicleinfoDto.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/StoragevehicleinfoDto.java
@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.master.service.dto;
+package org.nl.wms.masterdata_manage.备份master.service.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/dto/SupplierbaseDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/SupplierbaseDto.java
similarity index 96%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/dto/SupplierbaseDto.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/SupplierbaseDto.java
index a31ce7f8..2a985a05 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/dto/SupplierbaseDto.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/SupplierbaseDto.java
@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.master.service.dto;
+package org.nl.wms.masterdata_manage.备份master.service.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/dto/UnitDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/UnitDto.java
similarity index 91%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/dto/UnitDto.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/UnitDto.java
index e0ab3a41..e1a7b068 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/dto/UnitDto.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/dto/UnitDto.java
@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.master.service.dto;
+package org.nl.wms.masterdata_manage.备份master.service.dto;
 
 import lombok.Data;
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/impl/ClassstandardServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/ClassstandardServiceImpl.java
similarity index 99%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/impl/ClassstandardServiceImpl.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/ClassstandardServiceImpl.java
index 71b049d9..e8cdfd38 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/impl/ClassstandardServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/ClassstandardServiceImpl.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.masterdata_manage.master.service.impl;
+package org.nl.wms.masterdata_manage.备份master.service.impl;
 
 
 import cn.hutool.core.date.DateUtil;
@@ -20,8 +20,8 @@ import org.nl.modules.wql.core.bean.ResultBean;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.modules.wql.util.WqlUtil;
-import org.nl.wms.masterdata_manage.master.service.ClassstandardService;
-import org.nl.wms.masterdata_manage.master.service.dto.ClassstandardDto;
+import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
+import org.nl.wms.masterdata_manage.备份master.service.dto.ClassstandardDto;
 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/masterdata_manage/master/service/impl/CustomerbaseServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/CustomerbaseServiceImpl.java
similarity index 93%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/impl/CustomerbaseServiceImpl.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/CustomerbaseServiceImpl.java
index 29485773..b5cc3126 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/impl/CustomerbaseServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/CustomerbaseServiceImpl.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.masterdata_manage.master.service.impl;
+package org.nl.wms.masterdata_manage.备份master.service.impl;
 
 
 import cn.hutool.core.date.DateUtil;
@@ -16,10 +16,10 @@ 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.masterdata_manage.master.service.ClassstandardService;
-import org.nl.wms.masterdata_manage.master.service.CustomerbaseService;
-import org.nl.wms.masterdata_manage.master.service.dto.ClassstandardDto;
-import org.nl.wms.masterdata_manage.master.service.dto.CustomerbaseDto;
+import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
+import org.nl.wms.masterdata_manage.备份master.service.CustomerbaseService;
+import org.nl.wms.masterdata_manage.备份master.service.dto.ClassstandardDto;
+import org.nl.wms.masterdata_manage.备份master.service.dto.CustomerbaseDto;
 
 
 
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
similarity index 98%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/impl/MaterialbaseServiceImpl.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/MaterialbaseServiceImpl.java
index b0e66f0c..cac0be5e 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
@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.master.service.impl;
+package org.nl.wms.masterdata_manage.备份master.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapUtil;
@@ -18,10 +18,10 @@ import org.nl.modules.common.utils.RedisUtils;
 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.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.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_manage.pda.dto.MaterialDto;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/impl/SemirealrawmaterialServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/SemirealrawmaterialServiceImpl.java
similarity index 95%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/impl/SemirealrawmaterialServiceImpl.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/SemirealrawmaterialServiceImpl.java
index 49b8960d..f43863e7 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/impl/SemirealrawmaterialServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/SemirealrawmaterialServiceImpl.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.masterdata_manage.master.service.impl;
+package org.nl.wms.masterdata_manage.备份master.service.impl;
 
 
 import cn.hutool.core.date.DateUtil;
@@ -16,8 +16,8 @@ import lombok.extern.slf4j.Slf4j;
 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.SemirealrawmaterialService;
-import org.nl.wms.masterdata_manage.master.service.dto.SemirealrawmaterialDto;
+import org.nl.wms.masterdata_manage.备份master.service.SemirealrawmaterialService;
+import org.nl.wms.masterdata_manage.备份master.service.dto.SemirealrawmaterialDto;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/impl/StoragevehicleinfoServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/StoragevehicleinfoServiceImpl.java
similarity index 97%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/impl/StoragevehicleinfoServiceImpl.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/StoragevehicleinfoServiceImpl.java
index a6c49a3f..e9f2a69a 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/impl/StoragevehicleinfoServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/StoragevehicleinfoServiceImpl.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.masterdata_manage.master.service.impl;
+package org.nl.wms.masterdata_manage.备份master.service.impl;
 
 
 import cn.hutool.core.date.DateUtil;
@@ -19,8 +19,8 @@ import org.nl.modules.system.util.CodeUtil;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
-import org.nl.wms.masterdata_manage.master.service.StoragevehicleinfoService;
-import org.nl.wms.masterdata_manage.master.service.dto.StoragevehicleinfoDto;
+import org.nl.wms.masterdata_manage.备份master.service.StoragevehicleinfoService;
+import org.nl.wms.masterdata_manage.备份master.service.dto.StoragevehicleinfoDto;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/impl/SupplierbaseServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/SupplierbaseServiceImpl.java
similarity index 94%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/impl/SupplierbaseServiceImpl.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/SupplierbaseServiceImpl.java
index 925073a3..7cbf0d70 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/impl/SupplierbaseServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/SupplierbaseServiceImpl.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.masterdata_manage.master.service.impl;
+package org.nl.wms.masterdata_manage.备份master.service.impl;
 
 
 import cn.hutool.core.date.DateUtil;
@@ -16,10 +16,10 @@ 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.masterdata_manage.master.service.ClassstandardService;
-import org.nl.wms.masterdata_manage.master.service.SupplierbaseService;
-import org.nl.wms.masterdata_manage.master.service.dto.ClassstandardDto;
-import org.nl.wms.masterdata_manage.master.service.dto.SupplierbaseDto;
+import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
+import org.nl.wms.masterdata_manage.备份master.service.SupplierbaseService;
+import org.nl.wms.masterdata_manage.备份master.service.dto.ClassstandardDto;
+import org.nl.wms.masterdata_manage.备份master.service.dto.SupplierbaseDto;
 
 
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/impl/UnitServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/UnitServiceImpl.java
similarity index 96%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/impl/UnitServiceImpl.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/UnitServiceImpl.java
index f96fdd96..ff2684a1 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/impl/UnitServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/UnitServiceImpl.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.masterdata_manage.master.service.impl;
+package org.nl.wms.masterdata_manage.备份master.service.impl;
 
 
 import cn.hutool.core.date.DateUtil;
@@ -16,8 +16,8 @@ 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.masterdata_manage.master.service.UnitService;
-import org.nl.wms.masterdata_manage.master.service.dto.UnitDto;
+import org.nl.wms.masterdata_manage.备份master.service.UnitService;
+import org.nl.wms.masterdata_manage.备份master.service.dto.UnitDto;
 
 
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/wql/QMD_ME_ENDREALRAWMATERIAL001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/wql/QMD_ME_ENDREALRAWMATERIAL001.wql
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/wql/QMD_ME_ENDREALRAWMATERIAL001.wql
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/wql/QMD_ME_ENDREALRAWMATERIAL001.wql
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/wql/QMD_ME_MATERIAL.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/wql/QMD_ME_MATERIAL.wql
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/wql/QMD_ME_MATERIAL.wql
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/wql/QMD_ME_MATERIAL.wql
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/wql/QMD_ME_SEMIREALRAWMATERIAL001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/wql/QMD_ME_SEMIREALRAWMATERIAL001.wql
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/wql/QMD_ME_SEMIREALRAWMATERIAL001.wql
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/wql/QMD_ME_SEMIREALRAWMATERIAL001.wql
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/wql/QMD_ME_material_param01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/wql/QMD_ME_material_param01.wql
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/wql/QMD_ME_material_param01.wql
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/wql/QMD_ME_material_param01.wql
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/wql/QMD_PB_BUSINESSTYPEMATERIAL.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/wql/QMD_PB_BUSINESSTYPEMATERIAL.wql
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/wql/QMD_PB_BUSINESSTYPEMATERIAL.wql
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/wql/QMD_PB_BUSINESSTYPEMATERIAL.wql
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/wql/QMD_PB_CLASSBASE.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/wql/QMD_PB_CLASSBASE.wql
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/wql/QMD_PB_CLASSBASE.wql
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/wql/QMD_PB_CLASSBASE.wql
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/wql/QMD_PB_STORAGEVEHICLEEXT.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/wql/QMD_PB_STORAGEVEHICLEEXT.wql
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/wql/QMD_PB_STORAGEVEHICLEEXT.wql
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/wql/QMD_PB_STORAGEVEHICLEEXT.wql
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/wql/QMD_PB_STORAGEVEHICLEINFO.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/wql/QMD_PB_STORAGEVEHICLEINFO.wql
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/wql/QMD_PB_STORAGEVEHICLEINFO.wql
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/wql/QMD_PB_STORAGEVEHICLEINFO.wql
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/wql/QMD_PB_STORAGEVEHICLEPOINT.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/wql/QMD_PB_STORAGEVEHICLEPOINT.wql
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/wql/QMD_PB_STORAGEVEHICLEPOINT.wql
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/wql/QMD_PB_STORAGEVEHICLEPOINT.wql
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/wql/QMD_STORAGEVEHICLECLEANING.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/wql/QMD_STORAGEVEHICLECLEANING.wql
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/wql/QMD_STORAGEVEHICLECLEANING.wql
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/wql/QMD_STORAGEVEHICLECLEANING.wql
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/wql/QMT_MATERIALPARAMETERS_001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/wql/QMT_MATERIALPARAMETERS_001.wql
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/wql/QMT_MATERIALPARAMETERS_001.wql
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/wql/QMT_MATERIALPARAMETERS_001.wql
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/pdm/rest/WorkProcedureController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份pdm/rest/WorkProcedureController.java
similarity index 92%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/pdm/rest/WorkProcedureController.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份pdm/rest/WorkProcedureController.java
index 38bd0fdc..26e3b3d5 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/pdm/rest/WorkProcedureController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份pdm/rest/WorkProcedureController.java
@@ -1,14 +1,13 @@
 
-package org.nl.wms.masterdata_manage.pdm.rest;
+package org.nl.wms.masterdata_manage.备份pdm.rest;
 
 
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
  import lombok.RequiredArgsConstructor;
 import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.wms.masterdata_manage.pdm.service.WorkProcedureService;
-import org.nl.wms.masterdata_manage.pdm.service.dto.WorkProcedureDto;
+import org.nl.wms.masterdata_manage.备份pdm.service.WorkProcedureService;
+import org.nl.wms.masterdata_manage.备份pdm.service.dto.WorkProcedureDto;
 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/masterdata_manage/pdm/service/WorkProcedureService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份pdm/service/WorkProcedureService.java
similarity index 92%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/pdm/service/WorkProcedureService.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份pdm/service/WorkProcedureService.java
index 0584d9bb..f5db0477 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/pdm/service/WorkProcedureService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份pdm/service/WorkProcedureService.java
@@ -1,8 +1,8 @@
 
-package org.nl.wms.masterdata_manage.pdm.service;
+package org.nl.wms.masterdata_manage.备份pdm.service;
 
 import com.alibaba.fastjson.JSONArray;
-import org.nl.wms.masterdata_manage.pdm.service.dto.WorkProcedureDto;
+import org.nl.wms.masterdata_manage.备份pdm.service.dto.WorkProcedureDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/pdm/service/dto/WorkProcedureDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份pdm/service/dto/WorkProcedureDto.java
similarity index 94%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/pdm/service/dto/WorkProcedureDto.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份pdm/service/dto/WorkProcedureDto.java
index c4455213..d3ca29a1 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/pdm/service/dto/WorkProcedureDto.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份pdm/service/dto/WorkProcedureDto.java
@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.pdm.service.dto;
+package org.nl.wms.masterdata_manage.备份pdm.service.dto;
 
 import lombok.Data;
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/pdm/service/impl/WorkProcedureServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份pdm/service/impl/WorkProcedureServiceImpl.java
similarity index 96%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/pdm/service/impl/WorkProcedureServiceImpl.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份pdm/service/impl/WorkProcedureServiceImpl.java
index d770034e..628bff14 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/pdm/service/impl/WorkProcedureServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份pdm/service/impl/WorkProcedureServiceImpl.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.masterdata_manage.pdm.service.impl;
+package org.nl.wms.masterdata_manage.备份pdm.service.impl;
 
 
 import cn.hutool.core.date.DateUtil;
@@ -18,8 +18,8 @@ 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.system_manage.service.user.dto.CurrentUser;
-import org.nl.wms.masterdata_manage.pdm.service.WorkProcedureService;
-import org.nl.wms.masterdata_manage.pdm.service.dto.WorkProcedureDto;
+import org.nl.wms.masterdata_manage.备份pdm.service.WorkProcedureService;
+import org.nl.wms.masterdata_manage.备份pdm.service.dto.WorkProcedureDto;
 
 
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/IvtChangeTypeEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/IvtChangeTypeEnum.java
similarity index 93%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/IvtChangeTypeEnum.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/IvtChangeTypeEnum.java
index ec01be54..99dc952f 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/IvtChangeTypeEnum.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/IvtChangeTypeEnum.java
@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.st;
+package org.nl.wms.masterdata_manage.备份st;
 
 /**
  * // 11-扣减可用; 12-增加可用;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/StoreIvtServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/StoreIvtServiceImpl.java
similarity index 99%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/StoreIvtServiceImpl.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/StoreIvtServiceImpl.java
index e09b0368..6405a5d4 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/StoreIvtServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/StoreIvtServiceImpl.java
@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.st;
+package org.nl.wms.masterdata_manage.备份st;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/rest/MaterialsafeivtController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/MaterialsafeivtController.java
similarity index 92%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/rest/MaterialsafeivtController.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/MaterialsafeivtController.java
index 25dcdd52..4f29ad90 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/rest/MaterialsafeivtController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/MaterialsafeivtController.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.masterdata_manage.st.rest;
+package org.nl.wms.masterdata_manage.备份st.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.masterdata_manage.st.service.MaterialsafeivtService;
-import org.nl.wms.masterdata_manage.st.service.dto.MaterialsafeivtDto;
+import org.nl.wms.masterdata_manage.备份st.service.MaterialsafeivtService;
+import org.nl.wms.masterdata_manage.备份st.service.dto.MaterialsafeivtDto;
 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/masterdata_manage/st/rest/SectattrController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/SectattrController.java
similarity index 93%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/rest/SectattrController.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/SectattrController.java
index f814439d..c7ada9bd 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/rest/SectattrController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/SectattrController.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.masterdata_manage.st.rest;
+package org.nl.wms.masterdata_manage.备份st.rest;
 
 
 import com.alibaba.fastjson.JSONObject;
@@ -8,8 +8,8 @@ import io.swagger.annotations.ApiOperation;
  import lombok.RequiredArgsConstructor;
 import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.wms.masterdata_manage.st.service.SectattrService;
-import org.nl.wms.masterdata_manage.st.service.dto.SectattrDto;
+import org.nl.wms.masterdata_manage.备份st.service.SectattrService;
+import org.nl.wms.masterdata_manage.备份st.service.dto.SectattrDto;
 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/masterdata_manage/st/rest/StorattrController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/StorattrController.java
similarity index 93%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/rest/StorattrController.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/StorattrController.java
index 800a6c46..bb23c3ee 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/rest/StorattrController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/StorattrController.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.masterdata_manage.st.rest;
+package org.nl.wms.masterdata_manage.备份st.rest;
 
 
 import com.alibaba.fastjson.JSONObject;
@@ -8,8 +8,8 @@ import io.swagger.annotations.ApiOperation;
  import lombok.RequiredArgsConstructor;
 import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.wms.masterdata_manage.st.service.StorattrService;
-import org.nl.wms.masterdata_manage.st.service.dto.StorattrDto;
+import org.nl.wms.masterdata_manage.备份st.service.StorattrService;
+import org.nl.wms.masterdata_manage.备份st.service.dto.StorattrDto;
 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/masterdata_manage/st/rest/StructattrController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/StructattrController.java
similarity index 92%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/rest/StructattrController.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/StructattrController.java
index 6c5aba95..1df0ee60 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/rest/StructattrController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/StructattrController.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.masterdata_manage.st.rest;
+package org.nl.wms.masterdata_manage.备份st.rest;
 
 
 import com.alibaba.fastjson.JSONObject;
@@ -8,8 +8,8 @@ import io.swagger.annotations.ApiOperation;
  import lombok.RequiredArgsConstructor;
 import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.wms.masterdata_manage.st.service.StructattrService;
-import org.nl.wms.masterdata_manage.st.service.dto.StructattrDto;
+import org.nl.wms.masterdata_manage.备份st.service.StructattrService;
+import org.nl.wms.masterdata_manage.备份st.service.dto.StructattrDto;
 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/masterdata_manage/st/rest/StructivtController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/StructivtController.java
similarity index 93%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/rest/StructivtController.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/StructivtController.java
index d5e2a8e0..93528a7f 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/rest/StructivtController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/StructivtController.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.masterdata_manage.st.rest;
+package org.nl.wms.masterdata_manage.备份st.rest;
 
 
 import com.alibaba.fastjson.JSONObject;
@@ -8,8 +8,8 @@ import io.swagger.annotations.ApiOperation;
  import lombok.RequiredArgsConstructor;
 import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.wms.masterdata_manage.st.service.StructivtService;
-import org.nl.wms.masterdata_manage.st.service.dto.StructivtDto;
+import org.nl.wms.masterdata_manage.备份st.service.StructivtService;
+import org.nl.wms.masterdata_manage.备份st.service.dto.StructivtDto;
 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/masterdata_manage/st/rest/StructrelamaterialController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/StructrelamaterialController.java
similarity index 93%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/rest/StructrelamaterialController.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/StructrelamaterialController.java
index a0d873b1..d8f8161c 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/rest/StructrelamaterialController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/StructrelamaterialController.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.masterdata_manage.st.rest;
+package org.nl.wms.masterdata_manage.备份st.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.masterdata_manage.st.service.StructrelamaterialService;
-import org.nl.wms.masterdata_manage.st.service.dto.StructrelamaterialDto;
+import org.nl.wms.masterdata_manage.备份st.service.StructrelamaterialService;
+import org.nl.wms.masterdata_manage.备份st.service.dto.StructrelamaterialDto;
 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/masterdata_manage/st/rest/StructrelavehicletypeController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/StructrelavehicletypeController.java
similarity index 94%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/rest/StructrelavehicletypeController.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/StructrelavehicletypeController.java
index fe75c8fa..3590e689 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/rest/StructrelavehicletypeController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/rest/StructrelavehicletypeController.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.masterdata_manage.st.rest;
+package org.nl.wms.masterdata_manage.备份st.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.masterdata_manage.st.service.StructrelavehicletypeService;
+import org.nl.wms.masterdata_manage.备份st.service.StructrelavehicletypeService;
 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/masterdata_manage/st/service/MaterialsafeivtService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/MaterialsafeivtService.java
similarity index 89%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/MaterialsafeivtService.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/MaterialsafeivtService.java
index d666f6ab..dfe421d1 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/MaterialsafeivtService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/MaterialsafeivtService.java
@@ -1,7 +1,7 @@
 
-package org.nl.wms.masterdata_manage.st.service;
+package org.nl.wms.masterdata_manage.备份st.service;
 
-import org.nl.wms.masterdata_manage.st.service.dto.MaterialsafeivtDto;
+import org.nl.wms.masterdata_manage.备份st.service.dto.MaterialsafeivtDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/SectattrService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/SectattrService.java
similarity index 90%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/SectattrService.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/SectattrService.java
index a2169a28..7e3389ba 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/SectattrService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/SectattrService.java
@@ -1,8 +1,8 @@
 
-package org.nl.wms.masterdata_manage.st.service;
+package org.nl.wms.masterdata_manage.备份st.service;
 
 import com.alibaba.fastjson.JSONObject;
-import org.nl.wms.masterdata_manage.st.service.dto.SectattrDto;
+import org.nl.wms.masterdata_manage.备份st.service.dto.SectattrDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/StorattrService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/StorattrService.java
similarity index 90%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/StorattrService.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/StorattrService.java
index 45ddf57b..4b8e20ef 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/StorattrService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/StorattrService.java
@@ -1,8 +1,8 @@
 
-package org.nl.wms.masterdata_manage.st.service;
+package org.nl.wms.masterdata_manage.备份st.service;
 
 import com.alibaba.fastjson.JSONObject;
-import org.nl.wms.masterdata_manage.st.service.dto.StorattrDto;
+import org.nl.wms.masterdata_manage.备份st.service.dto.StorattrDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/StructattrService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/StructattrService.java
similarity index 90%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/StructattrService.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/StructattrService.java
index 7c5f24dc..a6a40ec3 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/StructattrService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/StructattrService.java
@@ -1,8 +1,8 @@
 
-package org.nl.wms.masterdata_manage.st.service;
+package org.nl.wms.masterdata_manage.备份st.service;
 
 import com.alibaba.fastjson.JSONObject;
-import org.nl.wms.masterdata_manage.st.service.dto.StructattrDto;
+import org.nl.wms.masterdata_manage.备份st.service.dto.StructattrDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/StructivtService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/StructivtService.java
similarity index 91%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/StructivtService.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/StructivtService.java
index 866c3a43..ce3b2573 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/StructivtService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/StructivtService.java
@@ -1,9 +1,9 @@
 
-package org.nl.wms.masterdata_manage.st.service;
+package org.nl.wms.masterdata_manage.备份st.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import org.nl.wms.masterdata_manage.st.service.dto.StructivtDto;
+import org.nl.wms.masterdata_manage.备份st.service.dto.StructivtDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/StructrelamaterialService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/StructrelamaterialService.java
similarity index 90%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/StructrelamaterialService.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/StructrelamaterialService.java
index 1c4b13e7..94ed18ef 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/StructrelamaterialService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/StructrelamaterialService.java
@@ -1,7 +1,7 @@
 
-package org.nl.wms.masterdata_manage.st.service;
+package org.nl.wms.masterdata_manage.备份st.service;
 
-import org.nl.wms.masterdata_manage.st.service.dto.StructrelamaterialDto;
+import org.nl.wms.masterdata_manage.备份st.service.dto.StructrelamaterialDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/StructrelavehicletypeService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/StructrelavehicletypeService.java
similarity index 90%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/StructrelavehicletypeService.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/StructrelavehicletypeService.java
index a50ea9a6..7989f745 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/StructrelavehicletypeService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/StructrelavehicletypeService.java
@@ -1,9 +1,9 @@
 
-package org.nl.wms.masterdata_manage.st.service;
+package org.nl.wms.masterdata_manage.备份st.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import org.nl.wms.masterdata_manage.st.service.dto.StructrelavehicletypeDto;
+import org.nl.wms.masterdata_manage.备份st.service.dto.StructrelavehicletypeDto;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/dto/MaterialsafeivtDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/dto/MaterialsafeivtDto.java
similarity index 93%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/dto/MaterialsafeivtDto.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/dto/MaterialsafeivtDto.java
index 73145a63..c14f7dbd 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/dto/MaterialsafeivtDto.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/dto/MaterialsafeivtDto.java
@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.st.service.dto;
+package org.nl.wms.masterdata_manage.备份st.service.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/dto/SectattrDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/dto/SectattrDto.java
similarity index 97%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/dto/SectattrDto.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/dto/SectattrDto.java
index f650c6e4..fca16eb6 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/dto/SectattrDto.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/dto/SectattrDto.java
@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.st.service.dto;
+package org.nl.wms.masterdata_manage.备份st.service.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/dto/StorattrDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/dto/StorattrDto.java
similarity index 97%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/dto/StorattrDto.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/dto/StorattrDto.java
index 5448abd7..1c9e06a8 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/dto/StorattrDto.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/dto/StorattrDto.java
@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.st.service.dto;
+package org.nl.wms.masterdata_manage.备份st.service.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/dto/StructattrDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/dto/StructattrDto.java
similarity index 98%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/dto/StructattrDto.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/dto/StructattrDto.java
index 3bd35ef3..9f67aeb4 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/dto/StructattrDto.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/dto/StructattrDto.java
@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.st.service.dto;
+package org.nl.wms.masterdata_manage.备份st.service.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/dto/StructivtDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/dto/StructivtDto.java
similarity index 96%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/dto/StructivtDto.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/dto/StructivtDto.java
index f28572b5..5ea1bfc1 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/dto/StructivtDto.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/dto/StructivtDto.java
@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.st.service.dto;
+package org.nl.wms.masterdata_manage.备份st.service.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/dto/StructrelamaterialDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/dto/StructrelamaterialDto.java
similarity index 92%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/dto/StructrelamaterialDto.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/dto/StructrelamaterialDto.java
index 0099be63..bb21ad08 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/dto/StructrelamaterialDto.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/dto/StructrelamaterialDto.java
@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.st.service.dto;
+package org.nl.wms.masterdata_manage.备份st.service.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/dto/StructrelavehicletypeDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/dto/StructrelavehicletypeDto.java
similarity index 93%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/dto/StructrelavehicletypeDto.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/dto/StructrelavehicletypeDto.java
index ebbeae5d..c848b4d3 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/dto/StructrelavehicletypeDto.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/dto/StructrelavehicletypeDto.java
@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.st.service.dto;
+package org.nl.wms.masterdata_manage.备份st.service.dto;
 
 import lombok.Data;
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/impl/MaterialsafeivtServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/impl/MaterialsafeivtServiceImpl.java
similarity index 95%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/impl/MaterialsafeivtServiceImpl.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/impl/MaterialsafeivtServiceImpl.java
index d74138f2..aad7705b 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/impl/MaterialsafeivtServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/impl/MaterialsafeivtServiceImpl.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.masterdata_manage.st.service.impl;
+package org.nl.wms.masterdata_manage.备份st.service.impl;
 
 
 import cn.hutool.core.date.DateUtil;
@@ -16,9 +16,9 @@ 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.masterdata_manage.master.service.ClassstandardService;
-import org.nl.wms.masterdata_manage.st.service.MaterialsafeivtService;
-import org.nl.wms.masterdata_manage.st.service.dto.MaterialsafeivtDto;
+import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
+import org.nl.wms.masterdata_manage.备份st.service.MaterialsafeivtService;
+import org.nl.wms.masterdata_manage.备份st.service.dto.MaterialsafeivtDto;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/impl/SectattrServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/impl/SectattrServiceImpl.java
similarity index 96%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/impl/SectattrServiceImpl.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/impl/SectattrServiceImpl.java
index 01bdf0fa..53f5cfbf 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/impl/SectattrServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/impl/SectattrServiceImpl.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.masterdata_manage.st.service.impl;
+package org.nl.wms.masterdata_manage.备份st.service.impl;
 
 
 import cn.hutool.core.date.DateUtil;
@@ -16,10 +16,10 @@ 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.masterdata_manage.st.service.SectattrService;
-import org.nl.wms.masterdata_manage.st.service.StorattrService;
-import org.nl.wms.masterdata_manage.st.service.dto.SectattrDto;
-import org.nl.wms.masterdata_manage.st.service.dto.StorattrDto;
+import org.nl.wms.masterdata_manage.备份st.service.SectattrService;
+import org.nl.wms.masterdata_manage.备份st.service.StorattrService;
+import org.nl.wms.masterdata_manage.备份st.service.dto.SectattrDto;
+import org.nl.wms.masterdata_manage.备份st.service.dto.StorattrDto;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/impl/StorattrServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/impl/StorattrServiceImpl.java
similarity index 97%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/impl/StorattrServiceImpl.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/impl/StorattrServiceImpl.java
index 3efe8055..9ea7a18f 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/impl/StorattrServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/impl/StorattrServiceImpl.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.masterdata_manage.st.service.impl;
+package org.nl.wms.masterdata_manage.备份st.service.impl;
 
 
 import cn.hutool.core.date.DateUtil;
@@ -16,8 +16,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.masterdata_manage.st.service.StorattrService;
-import org.nl.wms.masterdata_manage.st.service.dto.StorattrDto;
+import org.nl.wms.masterdata_manage.备份st.service.StorattrService;
+import org.nl.wms.masterdata_manage.备份st.service.dto.StorattrDto;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/impl/StructattrServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/impl/StructattrServiceImpl.java
similarity index 95%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/impl/StructattrServiceImpl.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/impl/StructattrServiceImpl.java
index 8b3671dc..7fcb78e1 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/impl/StructattrServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/impl/StructattrServiceImpl.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.masterdata_manage.st.service.impl;
+package org.nl.wms.masterdata_manage.备份st.service.impl;
 
 
 import cn.hutool.core.date.DateUtil;
@@ -16,12 +16,12 @@ 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.masterdata_manage.st.service.SectattrService;
-import org.nl.wms.masterdata_manage.st.service.StorattrService;
-import org.nl.wms.masterdata_manage.st.service.StructattrService;
-import org.nl.wms.masterdata_manage.st.service.dto.SectattrDto;
-import org.nl.wms.masterdata_manage.st.service.dto.StorattrDto;
-import org.nl.wms.masterdata_manage.st.service.dto.StructattrDto;
+import org.nl.wms.masterdata_manage.备份st.service.SectattrService;
+import org.nl.wms.masterdata_manage.备份st.service.StorattrService;
+import org.nl.wms.masterdata_manage.备份st.service.StructattrService;
+import org.nl.wms.masterdata_manage.备份st.service.dto.SectattrDto;
+import org.nl.wms.masterdata_manage.备份st.service.dto.StorattrDto;
+import org.nl.wms.masterdata_manage.备份st.service.dto.StructattrDto;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/impl/StructivtServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/impl/StructivtServiceImpl.java
similarity index 96%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/impl/StructivtServiceImpl.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/impl/StructivtServiceImpl.java
index aefcdc34..9d1f28db 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/impl/StructivtServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/impl/StructivtServiceImpl.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.masterdata_manage.st.service.impl;
+package org.nl.wms.masterdata_manage.备份st.service.impl;
 
 
 import cn.hutool.core.date.DateUtil;
@@ -21,9 +21,9 @@ 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.masterdata_manage.master.service.ClassstandardService;
-import org.nl.wms.masterdata_manage.st.service.StructivtService;
-import org.nl.wms.masterdata_manage.st.service.dto.StructivtDto;
+import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
+import org.nl.wms.masterdata_manage.备份st.service.StructivtService;
+import org.nl.wms.masterdata_manage.备份st.service.dto.StructivtDto;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/impl/StructrelamaterialServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/impl/StructrelamaterialServiceImpl.java
similarity index 95%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/impl/StructrelamaterialServiceImpl.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/impl/StructrelamaterialServiceImpl.java
index 9695cb56..49e1cf03 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/impl/StructrelamaterialServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/impl/StructrelamaterialServiceImpl.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.masterdata_manage.st.service.impl;
+package org.nl.wms.masterdata_manage.备份st.service.impl;
 
 
 import cn.hutool.core.date.DateUtil;
@@ -16,9 +16,9 @@ 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.masterdata_manage.master.service.ClassstandardService;
-import org.nl.wms.masterdata_manage.st.service.StructrelamaterialService;
-import org.nl.wms.masterdata_manage.st.service.dto.StructrelamaterialDto;
+import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
+import org.nl.wms.masterdata_manage.备份st.service.StructrelamaterialService;
+import org.nl.wms.masterdata_manage.备份st.service.dto.StructrelamaterialDto;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/impl/StructrelavehicletypeServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/impl/StructrelavehicletypeServiceImpl.java
similarity index 97%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/impl/StructrelavehicletypeServiceImpl.java
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/impl/StructrelavehicletypeServiceImpl.java
index 2ca6a0ce..2cbeafe1 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/service/impl/StructrelavehicletypeServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/service/impl/StructrelavehicletypeServiceImpl.java
@@ -1,5 +1,5 @@
 
-package org.nl.wms.masterdata_manage.st.service.impl;
+package org.nl.wms.masterdata_manage.备份st.service.impl;
 
 
 import cn.hutool.core.date.DateUtil;
@@ -15,8 +15,8 @@ import lombok.extern.slf4j.Slf4j;
 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.st.service.StructrelavehicletypeService;
-import org.nl.wms.masterdata_manage.st.service.dto.StructrelavehicletypeDto;
+import org.nl.wms.masterdata_manage.备份st.service.StructrelavehicletypeService;
+import org.nl.wms.masterdata_manage.备份st.service.dto.StructrelavehicletypeDto;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/wql/QLK01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/wql/QLK01.wql
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/wql/QLK01.wql
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/wql/QLK01.wql
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/wql/QST_IVT_MATERIALSAFE.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/wql/QST_IVT_MATERIALSAFE.wql
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/wql/QST_IVT_MATERIALSAFE.wql
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/wql/QST_IVT_MATERIALSAFE.wql
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/wql/QST_IVT_MATERIALSET.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/wql/QST_IVT_MATERIALSET.wql
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/wql/QST_IVT_MATERIALSET.wql
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/wql/QST_IVT_MATERIALSET.wql
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/wql/QST_SECT_ATTR.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/wql/QST_SECT_ATTR.wql
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/wql/QST_SECT_ATTR.wql
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/wql/QST_SECT_ATTR.wql
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/wql/QST_STOR_ATTR.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/wql/QST_STOR_ATTR.wql
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/wql/QST_STOR_ATTR.wql
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/wql/QST_STOR_ATTR.wql
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/wql/QST_STRUCTIVT001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/wql/QST_STRUCTIVT001.wql
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/wql/QST_STRUCTIVT001.wql
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/wql/QST_STRUCTIVT001.wql
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/wql/QST_STRUCT_ATTR.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/wql/QST_STRUCT_ATTR.wql
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/wql/QST_STRUCT_ATTR.wql
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/wql/QST_STRUCT_ATTR.wql
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/wql/ST_Structrelavehicletype_01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/wql/ST_Structrelavehicletype_01.wql
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/wql/ST_Structrelavehicletype_01.wql
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/wql/ST_Structrelavehicletype_01.wql
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/wql/stivt.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/wql/stivt.xls
similarity index 100%
rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/st/wql/stivt.xls
rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份st/wql/stivt.xls
diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/AddDialog.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/AddDialog.vue
index d48db6ea..8fe2fde4 100644
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/AddDialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/AddDialog.vue
@@ -27,19 +27,19 @@
         <el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
       </el-form-item>
       <el-form-item label="仓库" prop="product_code">
-        <label slot="label">生产车间:</label>
+        <label slot="label">所属仓库2:</label>
         <el-select
-          v-model="form.product_code"
+          v-model="form.stor_id"
           clearable
           class="filter-item"
           style="width: 210px"
           :disabled="crud.status.view > 0"
         >
           <el-option
-            v-for="item in dict.product_area"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
+            v-for="item in storlist"
+            :key="item.stor_id"
+            :label="item.stor_name"
+            :value="item.stor_id"
           />
         </el-select>
       </el-form-item>
@@ -86,7 +86,6 @@
         <el-input-number
           v-model="form.total_qty"
           :controls="false"
-          :precision="3"
           :min="0"
           disabled
           style="width: 210px"
@@ -181,13 +180,13 @@
 
 <script>
 import CRUD, { crud, form } from '@crud/crud'
-import crudSemiProductIn from '@/api/wms/st/in/semiProductIn'
+import crudsemiproductIn from '@/views/wms/storage_manage/semiproduct/semiproductIn/semiproductIn'
 import MaterDtl from '@/views/wms/pub/MaterDialog'
 
 const defaultForm = {
   bill_code: '',
   product_code: 'A1',
-  bill_status: '10',
+  bill_status: '1',
   total_qty: '0',
   detail_count: '0',
   bill_type: '',
@@ -202,6 +201,9 @@ export default {
   components: { MaterDtl },
   mixins: [crud(), form(defaultForm)],
   dicts: ['IO_BILL_STATUS', 'ST_QUALITY_SCODE', 'bill_type', 'product_area'],
+  cruds() {
+    return CRUD({ title: '入库新增', crudMethod: { ...crudsemiproductIn }})
+  },
   props: {
     dialogShow: {
       type: Boolean,
@@ -242,8 +244,8 @@ export default {
   },
   methods: {
     open() {
-      crudSemiProductIn.queryStor().then(res => {
-        this.storlist = res
+      crudsemiproductIn.queryStor().then(res => {
+        this.storlist = res.content
       })
     },
     close() {
@@ -251,7 +253,7 @@ export default {
     },
     [CRUD.HOOK.afterToEdit]() {
       // 获取入库单明细
-      crudSemiProductIn.getIODtl({ 'bill_code': this.form.bill_code }).then(res => {
+      crudsemiproductIn.getIODtl({ 'bill_code': this.form.bill_code }).then(res => {
         this.form.tableData = res
         // 将明细变成不可编辑
         for (let i = 0; i < this.form.tableData.length; i++) {
@@ -261,7 +263,7 @@ export default {
       })
     },
     [CRUD.HOOK.afterToView]() {
-      crudSemiProductIn.getIODtl({ 'bill_code': this.form.bill_code }).then(res => {
+      crudsemiproductIn.getIODtl({ 'bill_code': this.form.bill_code }).then(res => {
         this.form.tableData = res
         // 将明细变成不可编辑
         for (let i = 0; i < this.form.tableData.length; i++) {
diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/AddDtl.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/AddDtl.vue
index 733e80c4..0bc7699c 100644
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/AddDtl.vue
+++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/AddDtl.vue
@@ -100,7 +100,7 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
 import DateRangePicker from '@/components/DateRangePicker/index'
-import crudSemiProductIn from '@/api/wms/st/in/semiProductIn'
+import crudsemiproductIn from '@/views/wms/storage_manage/semiproduct/semiproductIn/semiproductIn'
 
 const start = new Date()
 export default {
@@ -170,7 +170,7 @@ export default {
       debugger
       this.$emit('update:dialogShow', false)
       this.rows = this.$refs.multipleTable.selection
-      crudSemiProductIn.queryBoxMater(this.rows).then(res => {
+      crudsemiproductIn.queryBoxMater(this.rows).then(res => {
         this.rows = res
         this.$emit('tableChanged', this.rows)
       })
diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/DivDialog.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/DivDialog.vue
index 6df7bc53..056f4719 100644
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/DivDialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/DivDialog.vue
@@ -285,7 +285,7 @@
 <script>
 import CRUD, { crud } from '@crud/crud'
 import StructDiv from '@/views/wms/pub/StructDialog'
-import crudSemiProductIn from '@/api/wms/st/in/semiProductIn'
+import crudsemiproductIn from '@/views/wms/storage_manage/semiproduct/semiproductIn/semiproductIn'
 import crudPoint from '@/api/wms/sch/point'
 import crudRegion from '@/api/wms/sch/region'
 
@@ -376,13 +376,13 @@ export default {
     },
     clcikRow(row, column, event) {
       this.form.dtl_row = row
-      crudSemiProductIn
+      crudsemiproductIn
         .getIODtl({ iostorinv_id: this.form.dtl_row.iostorinv_id })
         .then(res => {
           this.openParam = res
           this.form.dtl_row = res[row.index]
         })
-      crudSemiProductIn.getDisDtl(row).then(res => {
+      crudsemiproductIn.getDisDtl(row).then(res => {
         this.form.tableMater = res
       })
     },
@@ -395,7 +395,7 @@ export default {
         this.form.storagevehicle_code = ''
         return
       }
-      crudSemiProductIn
+      crudsemiproductIn
         .checkVehicle({
           storagevehicle_code: this.form.storagevehicle_code,
           dis_num: this.form.tableMater.length,
@@ -477,13 +477,13 @@ export default {
         this.crud.notify('载具号不能为空', CRUD.NOTIFICATION_TYPE.INFO)
         return
       }
-      crudSemiProductIn.confirmvehicle(this.dis_row).then(res => {
-        crudSemiProductIn
+      crudsemiproductIn.confirmvehicle(this.dis_row).then(res => {
+        crudsemiproductIn
           .getIODtl({ iostorinv_id: this.form.dtl_row.iostorinv_id })
           .then(res => {
             this.openParam = res
           })
-        crudSemiProductIn.getDisDtl(this.form.dtl_row).then(res => {
+        crudsemiproductIn.getDisDtl(this.form.dtl_row).then(res => {
           this.form.tableMater = res
           this.crud.notify('组盘成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
         })
@@ -516,8 +516,8 @@ export default {
         this.form.tableMater[i].region_name = row.region_name
         this.form.tableMater.splice(i, 1, this.form.tableMater[i]) // 通过splice 替换数据 触发视图更新
       }
-      crudSemiProductIn.divStruct(this.form).then(res => {
-        crudSemiProductIn
+      crudsemiproductIn.divStruct(this.form).then(res => {
+        crudsemiproductIn
           .getIODtl({
             iostorinv_id: this.form.dtl_row.iostorinv_id,
             open_flag: '1'
@@ -537,8 +537,8 @@ export default {
         this.crud.notify('请先选择一条明细！', CRUD.NOTIFICATION_TYPE.INFO)
         return
       }
-      crudSemiProductIn.divPoint(this.form).then(res => {
-        crudSemiProductIn
+      crudsemiproductIn.divPoint(this.form).then(res => {
+        crudsemiproductIn
           .getIODtl({
             iostorinv_id: this.form.dtl_row.iostorinv_id,
             open_flag: '1'
@@ -546,7 +546,7 @@ export default {
           .then(res => {
             this.openParam = res
           })
-        crudSemiProductIn.getDisDtl(this.form.dtl_row).then(res => {
+        crudsemiproductIn.getDisDtl(this.form.dtl_row).then(res => {
           this.form.tableMater = res
           this.crud.notify('设置起点成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
         })
@@ -566,10 +566,10 @@ export default {
         this.divBtn = true
         this.form.stor_id = this.stor_id
         this.form.is_pc = '1'
-        crudSemiProductIn
+        crudsemiproductIn
           .divStruct(this.form)
           .then(res => {
-            crudSemiProductIn
+            crudsemiproductIn
               .getIODtl({
                 iostorinv_id: this.form.dtl_row.iostorinv_id,
                 open_flag: '1'
@@ -577,7 +577,7 @@ export default {
               .then(res => {
                 this.openParam = res
               })
-            crudSemiProductIn.getDisDtl(this.form.dtl_row).then(res => {
+            crudsemiproductIn.getDisDtl(this.form.dtl_row).then(res => {
               this.form.tableMater = res
               this.divBtn = false
               this.crud.notify(
@@ -605,8 +605,8 @@ export default {
         return
       }
       // 如果勾选了，直接跳后台
-      crudSemiProductIn.unDivStruct(this.form).then(res => {
-        crudSemiProductIn
+      crudsemiproductIn.unDivStruct(this.form).then(res => {
+        crudsemiproductIn
           .getIODtl({
             iostorinv_id: this.form.dtl_row.iostorinv_id,
             open_flag: '1'
@@ -614,7 +614,7 @@ export default {
           .then(res => {
             this.openParam = res
           })
-        crudSemiProductIn.getDisDtl(this.form.dtl_row).then(res => {
+        crudsemiproductIn.getDisDtl(this.form.dtl_row).then(res => {
           this.form.tableMater = res
           this.crud.notify('取消分配成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
         })
diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/ViewDialog.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/ViewDialog.vue
index f092c243..35a59a8c 100644
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/ViewDialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/ViewDialog.vue
@@ -149,7 +149,7 @@
 <script>
 
 import { crud } from '@crud/crud'
-import crudSemiProductIn from '@/api/wms/st/in/semiProductIn'
+import crudsemiproductIn from '@/views/wms/storage_manage/semiproduct/semiproductIn/semiproductIn'
 
 export default {
   name: 'ViewDialog',
@@ -234,13 +234,13 @@ export default {
       this.currentDis = current
     },
     queryTableDtl() {
-      crudSemiProductIn.getIODtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
+      crudsemiproductIn.getIODtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
         this.tableDtl = res
       })
     },
     queryTableDdis() {
       if (this.currentdtl !== null) {
-        crudSemiProductIn.getDisTask({ 'iostorinvdtl_id': this.currentdtl.iostorinvdtl_id }).then(res => {
+        crudsemiproductIn.getDisTask({ 'iostorinvdtl_id': this.currentdtl.iostorinvdtl_id }).then(res => {
           debugger
           this.tabledis = res
         }).catch(() => {
diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/index.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/index.vue
index 90257efd..e3972cb9 100644
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/index.vue
+++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductIn/index.vue
@@ -11,27 +11,36 @@
           label-width="80px"
           label-suffix=":"
         >
-          <el-form-item label="模糊查询">
-            <el-input
-              v-model="query.bill_code"
-              size="mini"
-              clearable
-              placeholder="单据号"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-
-          <el-form-item label="生产车间">
+          <el-form-item label="所属仓库">
             <el-select
-              v-model="query.product_code"
+              v-model="query.stor_id"
               clearable
               size="mini"
-              placeholder="A1"
+              placeholder="单据状态"
               class="filter-item"
               @change="crud.toQuery"
             >
               <el-option
-                v-for="item in dict.product_area"
+                v-for="item in storlist"
+                :key="item.stor_id"
+                :label="item.stor_name"
+                :value="item.stor_id"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="单据类型">
+            <el-select
+              v-model="query.bill_type"
+              clearable
+              filterable
+              size="mini"
+              placeholder="单据类型"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.ST_INV_IN_TYPE"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
@@ -39,7 +48,26 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="创建时间">
+          <el-form-item label="生成方式">
+            <el-select
+              v-model="query.bill_type"
+              clearable
+              filterable
+              size="mini"
+              placeholder="生成方式"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.ST_INV_IN_TYPE"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="单据日期">
             <el-date-picker
               v-model="query.createTime"
               type="daterange"
@@ -69,24 +97,34 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="业务类型">
-            <el-select
-              v-model="query.bill_type"
-              clearable
-              filterable
+          <el-form-item label="入库单号">
+            <el-input
+              v-model="query.bill_code"
               size="mini"
-              placeholder="业务类型"
+              clearable
+              placeholder="单据号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+
+          <el-form-item label="所属仓库">
+            <el-select
+              v-model="query.product_code"
+              clearable
+              size="mini"
+              placeholder="全部"
               class="filter-item"
               @change="crud.toQuery"
             >
               <el-option
-                v-for="item in dict.bill_type"
+                v-for="item in dict.sortlist"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
               />
             </el-select>
           </el-form-item>
+
           <rrOperation />
         </el-form>
       </div>
@@ -174,29 +212,27 @@
 </template>
 
 <script>
-import semiProductIn from '@/api/wms/st/in/semiProductIn'
-import crudSemiProductIn from '@/api/wms/st/in/semiProductIn'
+import crudsemiproductIn from '@/views/wms/storage_manage/semiproduct/semiproductIn/semiproductIn'
 import CRUD, { crud, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
-import DateRangePicker from '@/components/DateRangePicker/index'
-import AddDialog from '@/views/wms/storage_manage/semiproduct/semiProductIn/AddDialog'
-import DivDialog from '@/views/wms/storage_manage/semiproduct/semiProductIn/DivDialog'
-import ViewDialog from '@/views/wms/storage_manage/semiproduct/semiProductIn/ViewDialog'
+import AddDialog from '@/views/wms/storage_manage/semiproduct/semiproductIn/AddDialog'
+import DivDialog from '@/views/wms/storage_manage/semiproduct/semiproductIn/DivDialog'
+import ViewDialog from '@/views/wms/storage_manage/semiproduct/semiproductIn/ViewDialog'
 import { mapGetters } from 'vuex'
 
 export default {
-  name: 'SemiProductIn',
-  components: { ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination, DateRangePicker, DivDialog },
+  name: 'semiproductIn',
+  components: { ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination, DivDialog },
   cruds() {
     return CRUD({
       title: '',
       optShow: { add: true, reset: true },
       idField: 'iostorinv_id',
-      url: '/api/in/semiProductIn',
-      crudMethod: { ...semiProductIn }
+      url: '/api/in/semiproductIn',
+      crudMethod: { ...crudsemiproductIn }
     })
   },
   mixins: [presenter(), header(), crud()],
@@ -231,7 +267,7 @@ export default {
     }
   },
   created() {
-    crudSemiProductIn.queryStor().then(res => {
+    crudsemiproductIn.queryStor().then(res => {
       this.storlist = res
     })
   },
@@ -291,7 +327,7 @@ export default {
         this.crud.notify('请选择一条单据', CRUD.NOTIFICATION_TYPE.INFO)
         return
       }
-      crudSemiProductIn.confirm(this.currentRow).then(res => {
+      crudsemiproductIn.confirm(this.currentRow).then(res => {
         this.crud.notify('单据确认成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
         this.crud.toQuery()
       })
@@ -300,7 +336,7 @@ export default {
       return this.dict.label.IO_BILL_STATUS[row.bill_status]
     },
     divOpen() {
-      crudSemiProductIn.getIODtl({ 'bill_code': this.currentRow.bill_code, 'open_flag': '1' }).then(res => {
+      crudsemiproductIn.getIODtl({ 'bill_code': this.currentRow.bill_code, 'open_flag': '1' }).then(res => {
         this.openParam = res
         debugger
         this.storId = this.currentRow.product_code
diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductOut/AddDialog.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductOut/AddDialog.vue
index 744097fc..06b21091 100644
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductOut/AddDialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductOut/AddDialog.vue
@@ -183,9 +183,9 @@
 
 <script>
 import CRUD, { crud, form } from '@crud/crud'
-import AddDtl from '@/views/wms/storage_manage/semiproduct/semiProductOut/AddDtl'
+import AddDtl from '@/views/wms/storage_manage/semiproduct/semiproductOut/AddDtl'
 import MaterDialog from '@/views/wms/pub/MaterDialog'
-import crudSemiProductIn from '@/api/wms/st/out/semiProductOut'
+import crudsemiproductIn from '@/views/wms/storage_manage/semiproduct/semiproductIn/semiproductIn'
 const defaultForm = {
   bill_code: '',
   stor_id: '',
@@ -247,7 +247,7 @@ export default {
   },
   methods: {
     open() {
-      crudSemiProductIn.queryStor().then(res => {
+      crudsemiproductIn.queryStor().then(res => {
         this.storlist = res
       })
     },
@@ -261,7 +261,7 @@ export default {
       }
     },
     [CRUD.HOOK.afterToEdit]() {
-      semiSemiProductOut.getOutBillDtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
+      semisemiproductOut.getOutBillDtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
         this.form.tableData = res
         // 将明细变成不可编辑
         /*   for (let i = 0; i < this.form.tableData.length; i++) {
@@ -272,7 +272,7 @@ export default {
       })
     },
     [CRUD.HOOK.afterToView]() {
-      semiSemiProductOut.getOutBillDtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
+      semisemiproductOut.getOutBillDtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
         this.form.tableData = res
         // 将明细变成不可编辑
         for (let i = 0; i < this.form.tableData.length; i++) {
diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductOut/DivDialog.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductOut/DivDialog.vue
index ab4be24a..0ff009ef 100644
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductOut/DivDialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductOut/DivDialog.vue
@@ -243,8 +243,8 @@
 
 <script>
 import CRUD, { crud } from '@crud/crud'
-import semiProductOut from '@/api/wms/st/out/semiProductOut'
-import StructIvt from '@/views/wms/storage_manage/semiproduct/semiProductOut/StructIvt'
+import semiproductOut from './semiproductOut'
+import StructIvt from '@/views/wms/storage_manage/semiproduct/semiproductOut/StructIvt'
 import crudRegion from '@/api/wms/sch/region'
 import crudPoint from '@/api/wms/sch/point'
 
@@ -378,7 +378,7 @@ export default {
     openStructIvt() {
       this.currentRow.remark = ''
       this.currentRow.stor_id = this.storId
-      semiProductOut.getStructIvt(this.currentRow).then(res => {
+      semiproductOut.getStructIvt(this.currentRow).then(res => {
         this.openParam = res
         this.structshow = true
         this.openRow = this.currentRow
@@ -406,7 +406,7 @@ export default {
       }
     },
     deleteRow(row) {
-      semiProductOut.oneCancel(row).then(res => {
+      semiproductOut.oneCancel(row).then(res => {
         this.queryTableDtl()
       })
     },
@@ -459,7 +459,7 @@ export default {
     },
     allDiv() {
       this.loadingAlldiv = true
-      semiProductOut.allDiv(this.mstrow).then(res => {
+      semiproductOut.allDiv(this.mstrow).then(res => {
         this.crud.notify('分配成功！', CRUD.NOTIFICATION_TYPE.INFO)
         this.queryTableDtl()
         this.loadingAlldiv = false
@@ -471,7 +471,7 @@ export default {
       this.loadingAutodiv = true
       if (this.currentRow.iostorinvdtl_id !== null) {
         this.mstrow.iostorinvdtl_id = this.currentRow.iostorinvdtl_id
-        semiProductOut.allDivOne(this.mstrow).then(res => {
+        semiproductOut.allDivOne(this.mstrow).then(res => {
           this.queryTableDtl()
           this.loadingAutodiv = false
         }).catch(() => {
@@ -480,13 +480,13 @@ export default {
       }
     },
     allCancel() {
-      semiProductOut.allCancel(this.mstrow).then(res => {
+      semiproductOut.allCancel(this.mstrow).then(res => {
         this.queryTableDtl()
       })
     },
     oneCancel() {
       if (this.currentRow.iostorinvdtl_id !== null) {
-        semiProductOut.allCancel(this.currentRow).then(res => {
+        semiproductOut.allCancel(this.currentRow).then(res => {
           this.queryTableDtl()
         })
       }
@@ -502,7 +502,7 @@ export default {
       }
       this.loadingSetAllPoint = true
       this.currentRow.point_code = this.form2.point_code
-      semiProductOut.allSetPoint(this.currentRow).then(res => {
+      semiproductOut.allSetPoint(this.currentRow).then(res => {
         this.queryTableDdis(this.currentRow.iostorinvdtl_id)
         this.crud.notify('设置成功！', CRUD.NOTIFICATION_TYPE.INFO)
         this.loadingSetAllPoint = false
@@ -520,7 +520,7 @@ export default {
         'point_code': this.form2.point_code,
         'iostorinv_id': this.mstrow.iostorinv_id
       }
-      semiProductOut.allSetPoint(data).then(res => {
+      semiproductOut.allSetPoint(data).then(res => {
         this.crud.notify('设置成功！', CRUD.NOTIFICATION_TYPE.INFO)
         this.loadingSetAllPoint = false
       }).catch(() => {
@@ -528,12 +528,12 @@ export default {
       })
     },
     queryTableDtl() {
-      semiProductOut.getOutBillDtl({ 'iostorinv_id': this.mstrow.iostorinv_id }).then(res => {
+      semiproductOut.getOutBillDtl({ 'iostorinv_id': this.mstrow.iostorinv_id }).then(res => {
         this.tableDtl = res
       })
     },
     queryTableDdis(iostorinvdtl_id) {
-      semiProductOut.getOutBillDis({ 'iostorinvdtl_id': iostorinvdtl_id, 'bill_status': '01' }).then(res => {
+      semiproductOut.getOutBillDis({ 'iostorinvdtl_id': iostorinvdtl_id, 'bill_status': '01' }).then(res => {
         this.tabledis = res
       }).catch(() => {
         this.tabledis = []
diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductOut/ViewDialog.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductOut/ViewDialog.vue
index 64945acc..f1c7cf05 100644
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductOut/ViewDialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductOut/ViewDialog.vue
@@ -150,8 +150,8 @@
 <script>
 
 import { crud } from '@crud/crud'
-import semiProductOut from '@/api/wms/st/out/semiProductOut'
-import crudSemiProductIn from '@/api/wms/st/in/semiProductIn'
+import semiproductOut from './semiproductOut'
+import crudsemiproductIn from '@/views/wms/storage_manage/semiproduct/semiproductIn/semiproductIn'
 
 export default {
   name: 'ViewDialog',
@@ -191,7 +191,7 @@ export default {
     }
   },
   created() {
-    crudSemiProductIn.queryStor().then(res => {
+    crudsemiproductIn.queryStor().then(res => {
       this.storlist = res
     })
   },
@@ -240,13 +240,13 @@ export default {
       this.currentDis = current
     },
     queryTableDtl() {
-      semiProductOut.getOutBillDtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
+      semiproductOut.getOutBillDtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
         this.tableDtl = res
       })
     },
     queryTableDdis() {
       if (this.currentdtl !== null) {
-        semiProductOut.getOutBillDis({ 'iostorinvdtl_id': this.currentdtl.iostorinvdtl_id }).then(res => {
+        semiproductOut.getOutBillDis({ 'iostorinvdtl_id': this.currentdtl.iostorinvdtl_id }).then(res => {
           this.tabledis = res
         }).catch(() => {
           this.tabledis = []
diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductOut/index.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductOut/index.vue
index 1f48750d..bd17d325 100644
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductOut/index.vue
+++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiProductOut/index.vue
@@ -169,22 +169,22 @@
 </template>
 
 <script>
-import semiProductOut from '@/api/wms/st/out/semiProductOut'
+import semiproductOut from './semiproductOut'
 import CRUD, { crud, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
-import AddDialog from '@/views/wms/storage_manage/semiproduct/semiProductOut/AddDialog'
-import DivDialog from '@/views/wms/storage_manage/semiproduct/semiProductOut/DivDialog'
-import ViewDialog from '@/views/wms/storage_manage/semiproduct/semiProductOut/ViewDialog'
-import crudSemiProductIn from '@/api/wms/st/in/semiProductIn'
+import AddDialog from '@/views/wms/storage_manage/semiproduct/semiproductOut/AddDialog'
+import DivDialog from '@/views/wms/storage_manage/semiproduct/semiproductOut/DivDialog'
+import ViewDialog from '@/views/wms/storage_manage/semiproduct/semiproductOut/ViewDialog'
+import crudsemiproductIn from '@/views/wms/storage_manage/semiproduct/semiproductIn/semiproductIn'
 
 export default {
-  name: 'SemiProductOut',
+  name: 'semiproductOut',
   components: { ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination, DivDialog },
   cruds() {
-    return CRUD({ title: '用户', idField: 'iostorinv_id', url: 'api/semiProductOut', crudMethod: { ...semiProductOut },
+    return CRUD({ title: '用户', idField: 'iostorinv_id', url: 'api/semiproductOut', crudMethod: { ...semiproductOut },
       optShow: {
         add: true,
         edit: false,
@@ -229,7 +229,7 @@ export default {
     }
   },
   created() {
-    crudSemiProductIn.queryStor().then(res => {
+    crudsemiproductIn.queryStor().then(res => {
       this.storlist = res
     })
   },
@@ -292,7 +292,7 @@ export default {
       return row.bill_status !== '99'
     },
     divOpen() {
-      semiProductOut.getOutBillDtl({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(res => {
+      semiproductOut.getOutBillDtl({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(res => {
         debugger
         this.openParam = res
         this.storId = this.currentRow.product_code
@@ -302,7 +302,7 @@ export default {
     },
     confirm() {
       this.loadingConfirm = true
-      semiProductOut.confirm({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(res => {
+      semiproductOut.confirm({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(res => {
         this.querytable()
         this.crud.notify('出库成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
         this.loadingConfirm = false