add:主数据载具

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;

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;
 

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","入库"),

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","生成"),

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;

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.ClassstandardService;
-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 org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

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.CustomerbaseService;
-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 org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

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.constant.MaterOptTypeEnum;
-import org.nl.wms.masterdata_manage.master.service.MaterialbaseService;
+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.service.dto.MaterialbaseDto;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

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.SemirealrawmaterialService;
-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 org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

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.StoragevehicleinfoService;
-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 org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

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.SupplierbaseService;
-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 org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

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.UnitService;
-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 org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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.ClassstandardService;
-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 org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

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.ClassstandardService;
-import org.nl.wms.masterdata_manage.master.service.CustomerbaseService;
+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.ClassstandardDto;
-import org.nl.wms.masterdata_manage.master.service.dto.CustomerbaseDto;
+import org.nl.wms.masterdata_manage.备份master.service.dto.CustomerbaseDto;
 
 
 

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.constant.MaterOptTypeEnum;
-import org.nl.wms.masterdata_manage.master.service.ClassstandardService;
+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.MaterialbaseService;
-import org.nl.wms.masterdata_manage.master.service.dto.MaterialbaseDto;
+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;

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.SemirealrawmaterialService;
-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 org.springframework.stereotype.Service;

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.StoragevehicleinfoService;
-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 org.springframework.stereotype.Service;

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.ClassstandardService;
-import org.nl.wms.masterdata_manage.master.service.SupplierbaseService;
+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.ClassstandardDto;
-import org.nl.wms.masterdata_manage.master.service.dto.SupplierbaseDto;
+import org.nl.wms.masterdata_manage.备份master.service.dto.SupplierbaseDto;
 
 
 

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.UnitService;
-import org.nl.wms.masterdata_manage.master.service.dto.UnitDto;
+import org.nl.wms.masterdata_manage.备份master.service.dto.UnitDto;
 
 
 

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.WorkProcedureService;
-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 org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

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;

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;
 

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.WorkProcedureService;
-import org.nl.wms.masterdata_manage.pdm.service.dto.WorkProcedureDto;
+import org.nl.wms.masterdata_manage.备份pdm.service.dto.WorkProcedureDto;
 
 
 

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-增加可用;

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;

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.MaterialsafeivtService;
-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 org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

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.SectattrService;
-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 org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

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.StorattrService;
-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 org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

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.StructattrService;
-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 org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

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.StructivtService;
-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 org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

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.StructrelamaterialService;
-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 org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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.备份master.service.ClassstandardService;
-import org.nl.wms.masterdata_manage.st.service.MaterialsafeivtService;
+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.dto.MaterialsafeivtDto;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;

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.SectattrService;
-import org.nl.wms.masterdata_manage.st.service.StorattrService;
+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.SectattrDto;
-import org.nl.wms.masterdata_manage.st.service.dto.StorattrDto;
+import org.nl.wms.masterdata_manage.备份st.service.dto.StorattrDto;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;

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.StorattrService;
-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 org.springframework.stereotype.Service;

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.SectattrService;
-import org.nl.wms.masterdata_manage.st.service.StorattrService;
+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.StructattrService;
-import org.nl.wms.masterdata_manage.st.service.dto.SectattrDto;
+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.StorattrDto;
-import org.nl.wms.masterdata_manage.st.service.dto.StructattrDto;
+import org.nl.wms.masterdata_manage.备份st.service.dto.StructattrDto;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;

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.备份master.service.ClassstandardService;
-import org.nl.wms.masterdata_manage.st.service.StructivtService;
+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.dto.StructivtDto;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;

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.备份master.service.ClassstandardService;
-import org.nl.wms.masterdata_manage.st.service.StructrelamaterialService;
+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.dto.StructrelamaterialDto;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;

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.StructrelavehicletypeService;
-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 org.springframework.stereotype.Service;

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"
+            v-for="item in storlist"
-            :key="item.value"
+            :key="item.stor_id"
-            :label="item.label"
+            :label="item.stor_name"
-            :value="item.value"
+            :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 => {
+      crudsemiproductIn.queryStor().then(res => {
-        this.storlist = 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++) {

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)
       })

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.confirmvehicle(this.dis_row).then(res => {
-        crudSemiProductIn
+        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.divStruct(this.form).then(res => {
-        crudSemiProductIn
+        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.divPoint(this.form).then(res => {
-        crudSemiProductIn
+        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.unDivStruct(this.form).then(res => {
-        crudSemiProductIn
+        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)
         })

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(() => {

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-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-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-form-item label="入库单号">
-            <el-select
+            <el-input
-              v-model="query.bill_type"
+              v-model="query.bill_code"
-              clearable
-              filterable
               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 '@/views/wms/storage_manage/semiproduct/semiproductIn/semiproductIn'
-import crudSemiProductIn from '@/api/wms/st/in/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 AddDialog from '@/views/wms/storage_manage/semiproduct/semiProductIn/AddDialog'
+import DivDialog from '@/views/wms/storage_manage/semiproduct/semiproductIn/DivDialog'
-import DivDialog from '@/views/wms/storage_manage/semiproduct/semiProductIn/DivDialog'
+import ViewDialog from '@/views/wms/storage_manage/semiproduct/semiproductIn/ViewDialog'
-import ViewDialog from '@/views/wms/storage_manage/semiproduct/semiProductIn/ViewDialog'
 import { mapGetters } from 'vuex'
 
 export default {
-  name: 'SemiProductIn',
+  name: 'semiproductIn',
-  components: { ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination, DateRangePicker, DivDialog },
+  components: { ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination, DivDialog },
   cruds() {
     return CRUD({
       title: '',
       optShow: { add: true, reset: true },
       idField: 'iostorinv_id',
-      url: '/api/in/semiProductIn',
+      url: '/api/in/semiproductIn',
-      crudMethod: { ...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

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++) {

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 semiproductOut from './semiproductOut'
-import StructIvt from '@/views/wms/storage_manage/semiproduct/semiProductOut/StructIvt'
+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 = []

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 semiproductOut from './semiproductOut'
-import crudSemiProductIn from '@/api/wms/st/in/semiProductIn'
+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 = []

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 AddDialog from '@/views/wms/storage_manage/semiproduct/semiproductOut/AddDialog'
-import DivDialog from '@/views/wms/storage_manage/semiproduct/semiProductOut/DivDialog'
+import DivDialog from '@/views/wms/storage_manage/semiproduct/semiproductOut/DivDialog'
-import ViewDialog from '@/views/wms/storage_manage/semiproduct/semiProductOut/ViewDialog'
+import ViewDialog from '@/views/wms/storage_manage/semiproduct/semiproductOut/ViewDialog'
-import crudSemiProductIn from '@/api/wms/st/in/semiProductIn'
+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