opt:分支合并

mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/service/impl/DevicelubricatemstServiceImpl.java

@@ -19,7 +19,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
 import org.nl.wms.device_manage.lubricate.service.DevicelubricatemstService;
 import org.nl.wms.device_manage.lubricate.service.dto.DevicelubricatemstDto;
-import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
+import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
 import org.nl.wms.system_manage.service.dept.ISysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;

mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/lubricate/service/impl/DevicelubricateplanmstServiceImpl.java

@@ -19,7 +19,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
 import org.nl.wms.device_manage.lubricate.service.DevicelubricateplanmstService;
 import org.nl.wms.device_manage.lubricate.service.dto.DevicelubricateplanmstDto;
-import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
+import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
 import org.nl.wms.system_manage.service.dept.ISysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;

mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/impl/DevicerepairmstServiceImpl.java

@@ -24,7 +24,7 @@ import org.nl.wms.device_manage.repair.service.DevicerepairmstService;
 import org.nl.wms.device_manage.repair.service.dto.DevicerepairmstDto;
 import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService;
 import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr;
-import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
+import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
 import org.nl.wms.system_manage.service.dept.ISysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;

mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/impl/DevicerepairplanmstServiceImpl.java

@@ -19,7 +19,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
 import org.nl.wms.device_manage.repair.service.DevicerepairplanmstService;
 import org.nl.wms.device_manage.repair.service.dto.DevicerepairplanmstDto;
-import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
+import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
 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/device_manage/repair/service/impl/DevicerepairrequestServiceImpl.java

@@ -20,7 +20,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
 import org.nl.wms.device_manage.repair.service.DevicerepairrequestService;
 import org.nl.wms.device_manage.repair.service.dto.DevicerepairrequestDto;
-import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
+import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
 import org.nl.wms.system_manage.service.dept.ISysDeptService;
 import org.nl.wms.system_manage.service.user.ISysUserService;
 import org.nl.wms.system_manage.service.user.dao.SysUser;

mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/service/impl/DevicesportcheckmstServiceImpl.java

@@ -19,7 +19,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
 import org.nl.wms.device_manage.sportcheck.service.DevicesportcheckmstService;
 import org.nl.wms.device_manage.sportcheck.service.dto.DevicesportcheckmstDto;
-import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
+import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
 import org.nl.wms.system_manage.service.dept.ISysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;

mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/sportcheck/service/impl/DevicesportcheckplanmstServiceImpl.java

@@ -19,7 +19,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
 import org.nl.wms.device_manage.sportcheck.service.DevicesportcheckplanmstService;
 import org.nl.wms.device_manage.sportcheck.service.dto.DevicesportcheckplanmstDto;
-import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
+import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
 import org.nl.wms.system_manage.service.dept.ISysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;

mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/stat/service/impl/DevicePairQueryServiceImpl.java

@@ -13,7 +13,7 @@ import org.nl.modules.common.utils.FileUtil;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.util.WqlUtil;
 import org.nl.wms.device_manage.stat.service.DevicePairQueryService;
-import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
+import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
 import org.nl.wms.system_manage.service.dept.ISysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;

mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/stat/service/impl/DevicefaultcaeServiceImpl.java

@@ -21,7 +21,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
 import org.nl.wms.device_manage.stat.service.DevicefaultcaeService;
 import org.nl.wms.device_manage.stat.service.dto.DevicesparepartivtDto;
-import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
+import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
 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/device_manage/upkeep/service/impl/DevicemaintenancemstServiceImpl.java

@@ -19,7 +19,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
 import org.nl.wms.device_manage.upkeep.service.DevicemaintenancemstService;
 import org.nl.wms.device_manage.upkeep.service.dto.DevicemaintenancemstDto;
-import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
+import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
 import org.nl.wms.system_manage.service.dept.ISysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;

mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java

@@ -19,7 +19,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
 import org.nl.wms.device_manage.upkeep.service.DevicemaintenanceplanmstService;
 import org.nl.wms.device_manage.upkeep.service.dto.DevicemaintenanceplanmstDto;
-import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
+import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
 import org.nl.wms.system_manage.service.dept.ISysDeptService;
 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/bfmaster/common/enums/MaterialEnum.java

@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.备份master.common.enums;
+package org.nl.wms.masterdata_manage.bfmaster.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/constant/MaterOptTypeEnum.java

@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.备份master.constant;
+package org.nl.wms.masterdata_manage.bfmaster.constant;
 
 import com.alibaba.fastjson.JSONObject;
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/eum/BusinessCodeEnum.java

@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.备份master.eum;
+package org.nl.wms.masterdata_manage.bfmaster.eum;
 
 public enum BusinessCodeEnum {
     STOCK_IN(1,"10","入库"),

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/eum/RecordStatusEnum.java

@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.备份master.eum;
+package org.nl.wms.masterdata_manage.bfmaster.eum;
 
 public enum RecordStatusEnum {
     CREATE(1,"01","生成"),

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/manage/AbstructMaterialType.java

@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.备份master.manage;
+package org.nl.wms.masterdata_manage.bfmaster.manage;
 
 import java.util.HashSet;
 import java.util.Set;

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/rest/MaterialbaseController.java

@@ -1,5 +1,5 @@
 
-package org.nl.wms.masterdata_manage.备份master.rest;
+package org.nl.wms.masterdata_manage.bfmaster.rest;
 
 
 import cn.hutool.core.map.MapUtil;
@@ -11,9 +11,9 @@ import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.utils.RedissonUtils;
-import org.nl.wms.masterdata_manage.备份master.constant.MaterOptTypeEnum;
+import org.nl.wms.masterdata_manage.bfmaster.constant.MaterOptTypeEnum;
-import org.nl.wms.masterdata_manage.备份master.service.MaterialbaseService;
+import org.nl.wms.masterdata_manage.bfmaster.service.MaterialbaseService;
-import org.nl.wms.masterdata_manage.备份master.service.dto.MaterialbaseDto;
+import org.nl.wms.masterdata_manage.bfmaster.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/bfmaster/rest/SemirealrawmaterialController.java

@@ -1,5 +1,5 @@
 
-package org.nl.wms.masterdata_manage.备份master.rest;
+package org.nl.wms.masterdata_manage.bfmaster.rest;
 
 
 import com.alibaba.fastjson.JSONObject;
@@ -9,8 +9,8 @@ import io.swagger.annotations.ApiOperation;
 import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.utils.RedissonUtils;
-import org.nl.wms.masterdata_manage.备份master.service.SemirealrawmaterialService;
+import org.nl.wms.masterdata_manage.bfmaster.service.SemirealrawmaterialService;
-import org.nl.wms.masterdata_manage.备份master.service.dto.SemirealrawmaterialDto;
+import org.nl.wms.masterdata_manage.bfmaster.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/bfmaster/rest/SupplierbaseController.java

@@ -1,5 +1,5 @@
 
-package org.nl.wms.masterdata_manage.备份master.rest;
+package org.nl.wms.masterdata_manage.bfmaster.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.bfmaster.service.SupplierbaseService;
-import org.nl.wms.masterdata_manage.备份master.service.dto.SupplierbaseDto;
+import org.nl.wms.masterdata_manage.bfmaster.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/bfmaster/service/ClassstandardService.java

@@ -1,9 +1,9 @@
 
-package org.nl.wms.masterdata_manage.备份master.service;
+package org.nl.wms.masterdata_manage.bfmaster.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.classstandard.dao.MdPbClassstandard;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
@@ -30,9 +30,9 @@ public interface ClassstandardService {
      * 查询所有数据不分页
      *
      * @param whereJson 条件参数
-     * @return List<ClassstandardDto>
+     * @return List<MdPbClassstandard>
      */
-    List<ClassstandardDto> queryAll(Map whereJson);
+    List<MdPbClassstandard> queryAll(Map whereJson);
 
     /**
      * 根据ID查询
@@ -40,7 +40,7 @@ public interface ClassstandardService {
      * @param class_id ID
      * @return Classstandard
      */
-    ClassstandardDto findById(String class_id);
+    MdPbClassstandard findById(String class_id);
 
     /**
      * 根据编码查询
@@ -48,7 +48,7 @@ public interface ClassstandardService {
      * @param code code
      * @return Classstandard
      */
-    ClassstandardDto findByCode(String code);
+    MdPbClassstandard findByCode(String code);
 
 
     /**
@@ -56,14 +56,14 @@ public interface ClassstandardService {
      *
      * @param dto /
      */
-    void create(ClassstandardDto dto);
+    void create(MdPbClassstandard dto);
 
     /**
      * 编辑
      *
      * @param dto /
      */
-    void update(ClassstandardDto dto);
+    void update(MdPbClassstandard dto);
 
     /**
      * 多选删除

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/MaterialbaseService.java

@@ -1,10 +1,10 @@
 
-package org.nl.wms.masterdata_manage.备份master.service;
+package org.nl.wms.masterdata_manage.bfmaster.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import org.nl.common.domain.query.PageQuery;
-import org.nl.wms.masterdata_manage.备份master.service.dto.MaterialbaseDto;
+import org.nl.wms.masterdata_manage.bfmaster.service.dto.MaterialbaseDto;
 import org.springframework.data.domain.Pageable;
 import org.springframework.web.multipart.MultipartFile;
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/SemirealrawmaterialService.java

@@ -1,8 +1,8 @@
 
-package org.nl.wms.masterdata_manage.备份master.service;
+package org.nl.wms.masterdata_manage.bfmaster.service;
 
 import com.alibaba.fastjson.JSONObject;
-import org.nl.wms.masterdata_manage.备份master.service.dto.SemirealrawmaterialDto;
+import org.nl.wms.masterdata_manage.bfmaster.service.dto.SemirealrawmaterialDto;
 import org.springframework.data.domain.Pageable;
 import org.springframework.web.multipart.MultipartFile;
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/SupplierbaseService.java

@@ -1,7 +1,7 @@
 
-package org.nl.wms.masterdata_manage.备份master.service;
+package org.nl.wms.masterdata_manage.bfmaster.service;
 
-import org.nl.wms.masterdata_manage.备份master.service.dto.SupplierbaseDto;
+import org.nl.wms.masterdata_manage.bfmaster.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/bfmaster/service/UnitService.java

@@ -1,8 +1,8 @@
 
-package org.nl.wms.masterdata_manage.备份master.service;
+package org.nl.wms.masterdata_manage.bfmaster.service;
 
 import com.alibaba.fastjson.JSONObject;
-import org.nl.wms.masterdata_manage.备份master.service.dto.UnitDto;
+import org.nl.wms.masterdata_manage.bfmaster.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/bfmaster/service/dto/BusinesstypematerialDto.java

@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.备份master.service.dto;
+package org.nl.wms.masterdata_manage.bfmaster.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/bfmaster/service/dto/CustomerbaseDto.java

@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.备份master.service.dto;
+package org.nl.wms.masterdata_manage.bfmaster.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/bfmaster/service/dto/EndrealsemimaterialDto.java

@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.备份master.service.dto;
+package org.nl.wms.masterdata_manage.bfmaster.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/bfmaster/service/dto/MaterialParametersDto.java

@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.备份master.service.dto;
+package org.nl.wms.masterdata_manage.bfmaster.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/bfmaster/service/dto/MaterialbaseDto.java

@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.备份master.service.dto;
+package org.nl.wms.masterdata_manage.bfmaster.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/bfmaster/service/dto/SemirealrawmaterialDto.java

@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.备份master.service.dto;
+package org.nl.wms.masterdata_manage.bfmaster.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/bfmaster/service/dto/StoragevehicleinfoDto.java

@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.备份master.service.dto;
+package org.nl.wms.masterdata_manage.bfmaster.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/bfmaster/service/dto/SupplierbaseDto.java

@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.备份master.service.dto;
+package org.nl.wms.masterdata_manage.bfmaster.service.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -17,7 +17,6 @@ import java.math.BigDecimal;
 public class SupplierbaseDto implements Serializable {
     /** 供应商标识 */
     /** 防止精度丢失 */
-    @JsonSerialize(using= ToStringSerializer.class)
     private Long supp_id;
 
     /** 供应商编码 */

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/dto/UnitDto.java

@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.备份master.service.dto;
+package org.nl.wms.masterdata_manage.bfmaster.service.dto;
 
 import lombok.Data;
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/impl/ClassstandardServiceImpl.java

@@ -1,9 +1,8 @@
 
-package org.nl.wms.masterdata_manage.备份master.service.impl;
+package org.nl.wms.masterdata_manage.bfmaster.service.impl;
 
 
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.db.Db;
@@ -13,6 +12,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.common.utils.IdUtil;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.wql.WQL;
@@ -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.bfmaster.service.ClassstandardService;
-import org.nl.wms.masterdata_manage.备份master.service.dto.ClassstandardDto;
+import org.nl.wms.masterdata_manage.master.service.classstandard.dao.MdPbClassstandard;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -71,53 +71,52 @@ public class ClassstandardServiceImpl implements ClassstandardService {
     }
 
     @Override
-    public List<ClassstandardDto> queryAll(Map whereJson) {
+    public List<MdPbClassstandard> queryAll(Map whereJson) { //MdPbClassstandard
         WQLObject wo = WQLObject.getWQLObject("MD_PB_ClassStandard");
         JSONArray arr = wo.query().getResultJSONArray(0);
-        List<ClassstandardDto> list = arr.toJavaList(ClassstandardDto.class);
+        List<MdPbClassstandard> list = arr.toJavaList(MdPbClassstandard.class);
         return list;
     }
 
     @Override
-    public ClassstandardDto findById(String class_id) {
+    public MdPbClassstandard findById(String class_id) {
         WQLObject wo = WQLObject.getWQLObject("MD_PB_ClassStandard");
         JSONObject json = wo.query("class_id = '" + class_id + "'").uniqueResult(0);
-        final ClassstandardDto obj = json.toJavaObject(ClassstandardDto.class);
+        MdPbClassstandard obj = json.toJavaObject(MdPbClassstandard.class);
         return obj;
     }
 
     @Override
-    public ClassstandardDto findByCode(String code) {
+    public MdPbClassstandard findByCode(String code) {
         WQLObject wo = WQLObject.getWQLObject("MD_PB_ClassStandard");
         JSONObject json = wo.query("class_code ='" + code + "'").uniqueResult(0);
         if (ObjectUtil.isEmpty(json)) return null;
-        final ClassstandardDto obj = json.toJavaObject(ClassstandardDto.class);
+        final MdPbClassstandard obj = json.toJavaObject(MdPbClassstandard.class);
         return obj;
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void create(ClassstandardDto dto) {
+    public void create(MdPbClassstandard dto) {
         String class_code = dto.getClass_code();
-        ClassstandardDto classstandardDto = this.findByCode(class_code);
+        MdPbClassstandard MdPbClassstandard = this.findByCode(class_code);
-        if (classstandardDto != null && classstandardDto.getIs_delete().equals("0") ) {
+        if (MdPbClassstandard != null && MdPbClassstandard.getIs_delete().equals("0") ) {
             throw new BadRequestException("存在相同的基础类别编号");
         }
         String currentUserId = SecurityUtils.getCurrentUserId();
         String nickName = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
 
-        dto.setClass_id(IdUtil.getSnowflake(1, 1).nextId());
+        dto.setClass_id(IdUtil.getStringId());
         dto.setCreate_id(currentUserId);
         dto.setCreate_name(nickName);
         dto.setUpdate_id(currentUserId);
         dto.setUpdate_name(nickName);
         dto.setUpdate_time(now);
         dto.setCreate_time(now);
-        dto.setIs_leaf("1");
+        dto.setIs_leaf(true);
         dto.setClass_level(Math.ceil(dto.getClass_code().length() / 2.0) + "");
-        dto.setSub_count(new BigDecimal(0));
+        dto.setSub_count(0);
-        dto.setPath_code(dto.getClass_code());
         dto.setLong_class_code(dto.getClass_code());
 
         WQLObject wo = WQLObject.getWQLObject("MD_PB_ClassStandard");
@@ -132,20 +131,20 @@ public class ClassstandardServiceImpl implements ClassstandardService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void update(ClassstandardDto dto) {
+    public void update(MdPbClassstandard dto) {
-        ClassstandardDto entity = this.findById(dto.getClass_id() + "");
+        MdPbClassstandard entity = this.findById(dto.getClass_id() + "");
         if (entity == null) {
             throw new BadRequestException("被删除或无权限，操作失败!");
         }
 
         String class_code = dto.getClass_code();
-        ClassstandardDto classstandardDto = this.findByCode(class_code);
+        MdPbClassstandard MdPbClassstandard = this.findByCode(class_code);
-        if (classstandardDto != null && !dto.getClass_id().equals(classstandardDto.getClass_id()) && classstandardDto.getIs_delete().equals("0") ) {
+        if (MdPbClassstandard != null && !dto.getClass_id().equals(MdPbClassstandard.getClass_id()) && MdPbClassstandard.getIs_delete().equals("0") ) {
             throw new BadRequestException("存在相同的供应商编号");
         }
 
-        Long oldPid = findById(dto.getClass_id() + "").getParent_class_id();
+        String oldPid = findById(dto.getClass_id() + "").getParent_class_id();
-        Long newPid = dto.getParent_class_id();
+        String newPid = dto.getParent_class_id();
 
         if (dto.getParent_class_id() != null && dto.getClass_id().equals(dto.getParent_class_id())) {
             throw new BadRequestException("上级不能为自己");
@@ -179,7 +178,7 @@ public class ClassstandardServiceImpl implements ClassstandardService {
         for (Long class_id : ids) {
             JSONObject param = new JSONObject();
             param.put("class_id", String.valueOf(class_id));
-            ClassstandardDto classstandardDto = findById(class_id + "");
+            MdPbClassstandard MdPbClassstandard = findById(class_id + "");
             param.put("is_delete", "1");
             param.put("update_optid", currentUserId);
             param.put("update_optname", nickName);
@@ -197,7 +196,7 @@ public class ClassstandardServiceImpl implements ClassstandardService {
                 }
                 this.deleteAll(child_ids);
             }
-            updateSubCnt(classstandardDto.getParent_class_id());
+            updateSubCnt(MdPbClassstandard.getParent_class_id());
         }
     }
 
@@ -341,19 +340,19 @@ public class ClassstandardServiceImpl implements ClassstandardService {
         JSONObject jo = new JSONObject();
         JSONArray ja = new JSONArray();
         String where = "";
-        ClassstandardDto classstandardDto = null;
+        MdPbClassstandard MdPbClassstandard = null;
         if (!StrUtil.isEmpty(parent_class_code)) {
-            classstandardDto = this.findByCode(parent_class_code);
+            MdPbClassstandard = this.findByCode(parent_class_code);
-            if (classstandardDto == null) {
+            if (MdPbClassstandard == null) {
                 throw new BadRequestException("请输入正确的父节点编号!");
             }
         }
         if (!StrUtil.isEmpty(class_code)) {
             where = " AND class_code IN ('" + class_code + "')";
         }
-        //parent_class_code不为空，查出 id等于classstandardDto.getClass_id()
+        //parent_class_code不为空，查出 id等于MdPbClassstandard.getClass_id()
         if (StrUtil.isNotEmpty(parent_class_code)) {
-            ja = WQLObject.getWQLObject("MD_PB_ClassStandard").query("class_id = '" + classstandardDto.getClass_id() + "' order by class_id").getResultJSONArray(0);
+            ja = WQLObject.getWQLObject("MD_PB_ClassStandard").query("class_id = '" + MdPbClassstandard.getClass_id() + "' order by class_id").getResultJSONArray(0);
         } else if (StrUtil.isNotEmpty(where)) {
             ja = WQLObject.getWQLObject("MD_PB_ClassStandard").query("1=1 " + where + " order by class_id").getResultJSONArray(0);
         } else if (StrUtil.isEmpty(parent_class_code) || parent_class_code.equals("0")) {
@@ -543,8 +542,8 @@ public class ClassstandardServiceImpl implements ClassstandardService {
     }
 
 
-    public void updateSubCnt(Long Id) {
+    public void updateSubCnt(String Id) {
-        if (Id != null && Id != 0) {
+        if (Id != null && !Id.equals("0")) {
             WQLObject wo = WQLObject.getWQLObject("MD_PB_ClassStandard");
             int count = wo.query("parent_class_id = '" + Id + "' AND is_delete = '0'").getResultJSONArray(0).size();
             JSONObject pid = wo.query("class_id = '" + Id + "'").uniqueResult(0);

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/impl/MaterialbaseServiceImpl.java

@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.备份master.service.impl;
+package org.nl.wms.masterdata_manage.bfmaster.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapUtil;
@@ -27,10 +27,10 @@ import org.nl.wms.masterdata_manage.service.master.IMdPbMeasureunitService;
 import org.nl.wms.masterdata_manage.service.master.dao.MdPbMeasureunit;
 import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService;
 import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase;
-import org.nl.wms.masterdata_manage.备份master.constant.MaterOptTypeEnum;
+import org.nl.wms.masterdata_manage.bfmaster.constant.MaterOptTypeEnum;
-import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
+import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
-import org.nl.wms.masterdata_manage.备份master.service.MaterialbaseService;
+import org.nl.wms.masterdata_manage.bfmaster.service.MaterialbaseService;
-import org.nl.wms.masterdata_manage.备份master.service.dto.MaterialbaseDto;
+import org.nl.wms.masterdata_manage.bfmaster.service.dto.MaterialbaseDto;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/impl/SemirealrawmaterialServiceImpl.java

@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.备份master.service.impl;
+package org.nl.wms.masterdata_manage.bfmaster.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapUtil;
@@ -20,8 +20,8 @@ import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
 import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService;
 import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase;
-import org.nl.wms.masterdata_manage.备份master.service.SemirealrawmaterialService;
+import org.nl.wms.masterdata_manage.bfmaster.service.SemirealrawmaterialService;
-import org.nl.wms.masterdata_manage.备份master.service.dto.SemirealrawmaterialDto;
+import org.nl.wms.masterdata_manage.bfmaster.service.dto.SemirealrawmaterialDto;
 import org.nl.wms.product_manage.service.workprocedure.IPdmBiWorkprocedureService;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/impl/StoragevehicleinfoServiceImpl2.java

@@ -1,5 +1,5 @@
 //
-//package org.nl.wms.masterdata_manage.备份master.service.impl;
+//package org.nl.wms.masterdata_manage.bfmaster.service.impl;
 //
 //
 //import cn.hutool.core.date.DateUtil;
@@ -21,7 +21,7 @@
 //import org.nl.modules.wql.util.WqlUtil;
 //import org.nl.wms.masterdata_manage.service.vehicle.IMdPbStoragevehicleinfoService;
 //import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleinfo;
-//import org.nl.wms.masterdata_manage.备份master.service.dto.StoragevehicleinfoDto;
+//import org.nl.wms.masterdata_manage.bfmaster.service.dto.StoragevehicleinfoDto;
 //
 //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/bfmaster/service/impl/SupplierbaseServiceImpl.java

@@ -1,5 +1,5 @@
 
-package org.nl.wms.masterdata_manage.备份master.service.impl;
+package org.nl.wms.masterdata_manage.bfmaster.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.bfmaster.service.ClassstandardService;
-import org.nl.wms.masterdata_manage.备份master.service.SupplierbaseService;
+import org.nl.wms.masterdata_manage.bfmaster.service.SupplierbaseService;
-import org.nl.wms.masterdata_manage.备份master.service.dto.ClassstandardDto;
+import org.nl.wms.masterdata_manage.master.service.classstandard.dao.MdPbClassstandard;
-import org.nl.wms.masterdata_manage.备份master.service.dto.SupplierbaseDto;
+import org.nl.wms.masterdata_manage.bfmaster.service.dto.SupplierbaseDto;
 
 
 
@@ -94,7 +94,7 @@ public class SupplierbaseServiceImpl implements SupplierbaseService {
         String nickName = SecurityUtils.getCurrentNickName();
 
 
-        ClassstandardDto classDto = classstandardService.findById(dto.getClass_id() + "");
+        MdPbClassstandard classDto = classstandardService.findById(dto.getClass_id() + "");
         if (ObjectUtil.isNotEmpty(classDto)) {
             dto.setClass_code(classDto.getClass_code());
             dto.setClass_name(classDto.getClass_name());
@@ -120,7 +120,7 @@ public class SupplierbaseServiceImpl implements SupplierbaseService {
         if (entity == null) {
             throw new BadRequestException("被删除或无权限，操作失败!");
         }
-        ClassstandardDto classDto = classstandardService.findById(dto.getClass_id() + "");
+        MdPbClassstandard classDto = classstandardService.findById(dto.getClass_id() + "");
         if (ObjectUtil.isNotEmpty(classDto)) {
             dto.setClass_code(classDto.getClass_code());
             dto.setClass_name(classDto.getClass_name());

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/impl/UnitServiceImpl.java

@@ -1,5 +1,5 @@
 
-package org.nl.wms.masterdata_manage.备份master.service.impl;
+package org.nl.wms.masterdata_manage.bfmaster.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.bfmaster.service.UnitService;
-import org.nl.wms.masterdata_manage.备份master.service.dto.UnitDto;
+import org.nl.wms.masterdata_manage.bfmaster.service.dto.UnitDto;
 
 
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfst/IvtChangeTypeEnum.java

@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.备份st;
+package org.nl.wms.masterdata_manage.bfst;
 
 /**
  * // 11-扣减可用; 12-增加可用;

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfst/StoreIvtServiceImpl.java

@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.备份st;
+package org.nl.wms.masterdata_manage.bfst;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfst/service/MaterialsafeivtService.java

@@ -1,7 +1,7 @@
 
-package org.nl.wms.masterdata_manage.备份st.service;
+package org.nl.wms.masterdata_manage.bfst.service;
 
-import org.nl.wms.masterdata_manage.备份st.service.dto.MaterialsafeivtDto;
+import org.nl.wms.masterdata_manage.bfst.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/bfst/service/StructrelamaterialService.java

@@ -1,7 +1,7 @@
 
-package org.nl.wms.masterdata_manage.备份st.service;
+package org.nl.wms.masterdata_manage.bfst.service;
 
-import org.nl.wms.masterdata_manage.备份st.service.dto.StructrelamaterialDto;
+import org.nl.wms.masterdata_manage.bfst.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/bfst/service/StructrelavehicletypeService.java

@@ -1,9 +1,9 @@
 
-package org.nl.wms.masterdata_manage.备份st.service;
+package org.nl.wms.masterdata_manage.bfst.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.bfst.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/bfst/service/dto/MaterialsafeivtDto.java

@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.备份st.service.dto;
+package org.nl.wms.masterdata_manage.bfst.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/bfst/service/dto/SectattrDto.java

@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.备份st.service.dto;
+package org.nl.wms.masterdata_manage.bfst.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/bfst/service/dto/StorattrDto.java

@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.备份st.service.dto;
+package org.nl.wms.masterdata_manage.bfst.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/bfst/service/dto/StructattrDto.java

@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.备份st.service.dto;
+package org.nl.wms.masterdata_manage.bfst.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/bfst/service/dto/StructivtDto.java

@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.备份st.service.dto;
+package org.nl.wms.masterdata_manage.bfst.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/bfst/service/dto/StructrelamaterialDto.java

@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.备份st.service.dto;
+package org.nl.wms.masterdata_manage.bfst.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/bfst/service/dto/StructrelavehicletypeDto.java

@@ -1,4 +1,4 @@
-package org.nl.wms.masterdata_manage.备份st.service.dto;
+package org.nl.wms.masterdata_manage.bfst.service.dto;
 
 import lombok.Data;
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfst/service/impl/MaterialsafeivtServiceImpl.java

@@ -1,5 +1,5 @@
 
-package org.nl.wms.masterdata_manage.备份st.service.impl;
+package org.nl.wms.masterdata_manage.bfst.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.bfmaster.service.ClassstandardService;
-import org.nl.wms.masterdata_manage.备份st.service.MaterialsafeivtService;
+import org.nl.wms.masterdata_manage.bfst.service.MaterialsafeivtService;
-import org.nl.wms.masterdata_manage.备份st.service.dto.MaterialsafeivtDto;
+import org.nl.wms.masterdata_manage.bfst.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/bfst/service/impl/StructrelamaterialServiceImpl.java

@@ -1,5 +1,5 @@
 
-package org.nl.wms.masterdata_manage.备份st.service.impl;
+package org.nl.wms.masterdata_manage.bfst.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.bfmaster.service.ClassstandardService;
-import org.nl.wms.masterdata_manage.备份st.service.StructrelamaterialService;
+import org.nl.wms.masterdata_manage.bfst.service.StructrelamaterialService;
-import org.nl.wms.masterdata_manage.备份st.service.dto.StructrelamaterialDto;
+import org.nl.wms.masterdata_manage.bfst.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/bfst/service/impl/StructrelavehicletypeServiceImpl.java

@@ -1,5 +1,5 @@
 
-package org.nl.wms.masterdata_manage.备份st.service.impl;
+package org.nl.wms.masterdata_manage.bfst.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.bfst.service.StructrelavehicletypeService;
-import org.nl.wms.masterdata_manage.备份st.service.dto.StructrelavehicletypeDto;
+import org.nl.wms.masterdata_manage.bfst.service.dto.StructrelavehicletypeDto;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/impl/DeviceLubricateitemsServiceImpl.java

@@ -18,7 +18,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
 import org.nl.wms.masterdata_manage.em.service.DeviceLubricateitemsService;
 import org.nl.wms.masterdata_manage.em.service.dto.DevicemaintenanceitemsDto;
-import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
+import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
 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/em/service/impl/DeviceSportCheckitemsServiceImpl.java

@@ -18,7 +18,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
 import org.nl.wms.masterdata_manage.em.service.DeviceSportCheckitemsService;
 import org.nl.wms.masterdata_manage.em.service.dto.DevicemaintenanceitemsDto;
-import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
+import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
 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/em/service/impl/DevicefaultclassServiceImpl.java

@@ -18,7 +18,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
 import org.nl.wms.masterdata_manage.em.service.DevicefaultclassService;
 import org.nl.wms.masterdata_manage.em.service.dto.DevicefaultclassDto;
-import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
+import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
 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/em/service/impl/DevicemaintenanceitemsServiceImpl.java

@@ -18,7 +18,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
 import org.nl.wms.masterdata_manage.em.service.DevicemaintenanceitemsService;
 import org.nl.wms.masterdata_manage.em.service.dto.DevicemaintenanceitemsDto;
-import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
+import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
 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/em/service/impl/DevicerepairitemsServiceImpl.java

@@ -18,7 +18,7 @@ import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
 import org.nl.wms.masterdata_manage.em.service.DevicerepairitemsService;
 import org.nl.wms.masterdata_manage.em.service.dto.DevicerepairitemsDto;
-import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
+import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
 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/em/service/impl/EquipmentfileServiceImpl.java

@@ -17,7 +17,7 @@ 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.em.service.EquipmentfileService;
-import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
+import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
 import org.nl.wms.system_manage.service.dept.ISysDeptService;
 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/master/controller/classstandard/ClassstandardController.java

@@ -15,8 +15,8 @@ import org.nl.common.anno.Log;
 import org.nl.common.utils.RedissonUtils;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.wms.masterdata_manage.master.service.classstandard.IMdPbClassstandardService;
-import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
+import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
-import org.nl.wms.masterdata_manage.备份master.service.dto.ClassstandardDto;
+import org.nl.wms.masterdata_manage.master.service.classstandard.dao.MdPbClassstandard;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -44,13 +44,13 @@ public class ClassstandardController {
     private final ClassstandardService ClassstandardService;
 
     @Autowired
-    private IMdPbClassstandardService mdPbClassstandardService;
+    private IMdPbClassstandardService MdPbClassstandardService;
 
     @GetMapping
     @Log("查询基础类别")
     //("查询基础类别")
     public ResponseEntity<Object> queryList(@RequestParam Map whereJson) {
-        return new ResponseEntity<>(TableDataInfo.build(mdPbClassstandardService.dropdownList(whereJson)), HttpStatus.OK);
+        return new ResponseEntity<>(TableDataInfo.build(MdPbClassstandardService.dropdownList(whereJson)), HttpStatus.OK);
     }
 
     @PostMapping
@@ -58,7 +58,7 @@ public class ClassstandardController {
     //("新增基础类别")
     //@PreAuthorize("@el.check('Classstandard:add')")
     public ResponseEntity<Object> create(@Validated @RequestBody JSONObject form) {
-        mdPbClassstandardService.create(form);
+        MdPbClassstandardService.create(form);
         return new ResponseEntity<>(HttpStatus.CREATED);
     }
 
@@ -67,7 +67,7 @@ public class ClassstandardController {
     //("修改基础类别")
     //@PreAuthorize("@el.check('Classstandard:edit')")
     public ResponseEntity<Object> update(@Validated @RequestBody JSONObject form) {
-        mdPbClassstandardService.updateForm(form);
+        MdPbClassstandardService.updateForm(form);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
 
@@ -76,7 +76,7 @@ public class ClassstandardController {
     //@PreAuthorize("@el.check('Classstandard:del')")
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody String[] ids) {
-        mdPbClassstandardService.deleteAll(ids);
+        MdPbClassstandardService.deleteAll(ids);
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
@@ -85,7 +85,7 @@ public class ClassstandardController {
     //("查询基础类型")
     //@PreAuthorize("@el.check('materialtype:list')")
     public ResponseEntity<Object> query(@RequestParam Map whereJson) {
-        return new ResponseEntity<>(TableDataInfo.build(mdPbClassstandardService.loadClass(whereJson)), HttpStatus.OK);
+        return new ResponseEntity<>(TableDataInfo.build(MdPbClassstandardService.loadClass(whereJson)), HttpStatus.OK);
     }
 
     @GetMapping("/getClass")
@@ -93,7 +93,7 @@ public class ClassstandardController {
     //("查询基础类型")
     //@PreAuthorize("@el.check('materialtype:list')")
     public ResponseEntity<Object> queryClassBycode(@RequestParam Map whereJson) {
-        return new ResponseEntity<>(TableDataInfo.build(mdPbClassstandardService.queryClassBycode(whereJson)), HttpStatus.OK);
+        return new ResponseEntity<>(TableDataInfo.build(MdPbClassstandardService.queryClassBycode(whereJson)), HttpStatus.OK);
     }
 
 
@@ -102,7 +102,7 @@ public class ClassstandardController {
     //("查询分类基础列表")
     //@PreAuthorize("@el.check('materialtype:list')")
     public ResponseEntity<Object> queryClassById(@RequestParam Map whereJson) {
-        return new ResponseEntity<>(TableDataInfo.build(mdPbClassstandardService.queryClassById(whereJson)), HttpStatus.OK);
+        return new ResponseEntity<>(TableDataInfo.build(MdPbClassstandardService.queryClassById(whereJson)), HttpStatus.OK);
     }
 
     @GetMapping("/getClassTable")
@@ -144,7 +144,7 @@ public class ClassstandardController {
     @ApiOperation("excel导入")
     public ResponseEntity<Object> excelImport(@RequestParam("file") MultipartFile file, HttpServletRequest request, HttpServletResponse response) {
         RedissonUtils.lock(() -> {
-            mdPbClassstandardService.excelImport(file, request, response);
+            MdPbClassstandardService.excelImport(file, request, response);
         }, "基础分类导入", null);
         return new ResponseEntity<>(HttpStatus.OK);
     }

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/impl/MdPbClassstandardServiceImpl.java

@@ -172,7 +172,7 @@ public class MdPbClassstandardServiceImpl extends ServiceImpl<MdPbClassstandardM
     }
 
     public void updateSubCnt(String class_id) {
-        if (!StringUtils.isEmpty(class_id)) {
+        if (!StringUtils.isEmpty(class_id) && !class_id.equals("0")) {
             MdPbClassstandard one = this.getOne(new QueryWrapper<MdPbClassstandard>().eq("class_id", class_id).eq("is_delete", false));
             if (one == null) {
                 throw new BadRequestException(class_id + "没有对应分类数据");

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/customer/impl/MdCsCustomerbaseServiceImpl.java

@@ -19,8 +19,8 @@ import org.nl.wms.masterdata_manage.master.service.customer.dao.MdCsCustomerbase
 import org.nl.wms.masterdata_manage.master.service.customer.dao.mapper.MdCsCustomerbaseMapper;
 import org.nl.wms.masterdata_manage.master.service.customer.IMdCsCustomerbaseService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.nl.wms.masterdata_manage.备份master.service.dto.ClassstandardDto;
+import org.nl.wms.masterdata_manage.master.service.classstandard.dao.MdPbClassstandard;
-import org.nl.wms.masterdata_manage.备份master.service.dto.CustomerbaseDto;
+import org.nl.wms.masterdata_manage.bfmaster.service.dto.CustomerbaseDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/IMdPbStoragevehicleinfoService.java

@@ -7,7 +7,7 @@ import org.nl.common.domain.query.PageQuery;
 import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleinfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.nl.wms.masterdata_manage.service.vehicle.dto.VehicleQuery;
-import org.nl.wms.masterdata_manage.备份master.service.dto.StoragevehicleinfoDto;
+import org.nl.wms.masterdata_manage.bfmaster.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/service/vehicle/impl/MdPbStoragevehicleinfoServiceImpl.java

@@ -28,7 +28,7 @@ import org.nl.wms.masterdata_manage.service.vehicle.dao.mapper.MdPbStoragevehicl
 import org.nl.wms.masterdata_manage.service.vehicle.IMdPbStoragevehicleinfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.nl.wms.masterdata_manage.service.vehicle.dto.VehicleQuery;
-import org.nl.wms.masterdata_manage.备份master.service.dto.StoragevehicleinfoDto;
+import org.nl.wms.masterdata_manage.bfmaster.service.dto.StoragevehicleinfoDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;

mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/vehicle/StructrelavehicletypeController.java

@@ -4,11 +4,10 @@ package org.nl.wms.masterdata_manage.storage.controller.vehicle;
 
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.anno.Log;
-import org.nl.wms.masterdata_manage.备份st.service.StructrelavehicletypeService;
+import org.nl.wms.masterdata_manage.bfst.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/备份master/service/dto/ClassstandardDto.java

@@ -1,59 +0,0 @@
-package org.nl.wms.masterdata_manage.备份master.service.dto;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * @description /
- * @author zhouz
- * @date 2021-12-07
- **/
-@Data
-public class ClassstandardDto implements Serializable {
-
-        /** 防止精度丢失 */
-        @JsonSerialize(using= ToStringSerializer.class)
-        private Long class_id;
-
-        private String path_code;
-
-        private String class_code;
-
-        private String long_class_code;
-
-        private String class_name;
-
-        private String class_desc;
-
-        private Long parent_class_id;
-
-        private String is_leaf;
-
-        private BigDecimal sub_count;
-
-        private String is_modify;
-
-        private String is_delete;
-
-        private String class_level;
-
-        private String ext_id;
-
-        private String ext_parent_id;
-
-        private String create_id;
-
-        private String create_name;
-
-        private String create_time;
-
-        private String update_id;
-
-        private String update_name;
-
-        private String update_time;
-}

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/impl/ProduceshiftorderServiceImpl.java

@@ -29,7 +29,7 @@ import org.nl.modules.wql.util.WqlUtil;
 import org.nl.wms.system_manage.service.user.ISysUserService;
 import org.nl.wms.system_manage.service.user.dao.SysUser;
 import org.nl.wms.system_manage.service.user.dto.CurrentUser;
-import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
+import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
 import org.nl.wms.ext_manage.acs.service.WmsToAcsService;
 import org.nl.wms.mps_manage.other.service.ProduceshiftorderService;
 import org.nl.wms.mps_manage.other.service.WorkOrderImportEnum;

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/impl/TaskServiceImpl.java

@@ -14,7 +14,7 @@ import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.WqlUtil;
-import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService;
+import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService;
 import org.nl.wms.ext_manage.acs.service.AcsToWmsService;
 import org.nl.wms.scheduler_manage.service.task.TaskService;
 import org.nl.wms.scheduler_manage.service.task.dto.TaskDto;
@@ -68,7 +68,7 @@ public class TaskServiceImpl implements TaskService {
             map.put("vehicle_code", "%" + whereJson.getString("vehicle_code") + "%");
         }
         if (StrUtil.isNotEmpty(whereJson.getString("task_type"))) {
-//            ClassstandardDto task_type = classstandardService.findById(whereJson.getString("task_type"));
+//            MdPbClassstandard task_type = classstandardService.findById(whereJson.getString("task_type"));
             map.put("task_type", whereJson.getString("task_type"));
         }
         if (StrUtil.isNotEmpty(whereJson.getString("finishTypeList"))) {

mes/hd/nladmin-system/src/main/resources/config/application.yml

@@ -2,7 +2,7 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
-    active: prod
+    active: dev3
   jackson:
     time-zone: GMT+8
   data:
@@ -12,7 +12,7 @@ spring:
 task:
   pool:
     # 核心线程池大小
-    core-pool-size: 10
+    core-pool-size: 10pcsIfPurchaseorder/confirm
     # 最大线程数
     max-pool-size: 30
     # 活跃时间

mes/hd/nladmin-system/src/main/resources/sql/aps_insert_sql_0919.sql

@@ -38654,3 +38654,6 @@ INSERT INTO `pdm_bi_workprocedure` VALUES ('1694247968535875584', 'A3', 'A3_CPQX
 
 SET FOREIGN_KEY_CHECKS = 1;
 
+
+update md_me_materialbase set material_type_id = '' where material_type_id = '1638127956159238144';
+update md_me_materialbase set base_unit_id = '1', assist_unit_id = '1' where material_code like '10100%';

mes/qd/src/views/wms/masterdata_manage/master/customer/index.vue

@@ -286,7 +286,8 @@ export default {
       })
     },
     getClass() {
-      crudClassstandard.getClass({ enabled: true, 'base_data_type': '05' }).then(res => {
+      //queryClassById?class_idStr=1528555443906023424
+      crudClassstandard.queryClassById({ enabled: true, 'class_idStr': '1704039126057226240' }).then(res => {
         this.classes = res.content.map(function(obj) {
           if (obj.hasChildren) {
             obj.children = null

mes/qd/src/views/wms/masterdata_manage/master/storagevehicleinfo/index.vue

@@ -81,7 +81,7 @@
           </el-form-item>
           <el-form-item label="物料编码" prop="material_code">
             <template slot-scope="scope">
-              <el-input v-model="materialForm.material_code" clearable style="width: 370px">
+              <el-input v-model="materialForm.material_code" clearable style="width: 370px" @clear="materialForm.material_id='',materialForm.material_code='',materialForm.material_name='',materialForm.material_spec=''">
                 <el-button slot="append" icon="el-icon-plus" @click="queryMater(scope.$index, scope.row)" />
               </el-input>
             </template>
@@ -109,7 +109,7 @@
         @close="materiValueCancel()"
       >
         <el-form ref="form" :model="updateForm" :rules="rules" size="mini" label-width="110px">
-          <el-form-item label="载具编号" prop="material_code">
+          <el-form-item label="载具编号" prop="storagevehicle_code">
             <template slot-scope="scope">
               <el-input v-model="updateForm.storagevehicle_code" clearable>
               </el-input>
@@ -303,7 +303,7 @@ export default {
     return {
       updateForm: {},
       pointMVisible: false,
-      materType:'',
+      materType:'01',
       materialShow: false,
       dialogVisible: false,
       materialForm: {},
@@ -348,14 +348,10 @@ export default {
     },
     queryMater(index, row) {
       this.materialShow = true
-      this.nowindex = index
-      this.nowrow = row
     },
     setMaterValue(row) {
-      this.materialForm.material_id = row.material_id
+      this.$set(this.materialForm, 'material_code', row.material_code)
-      this.materialForm.material_code = row.material_code
+      this.$set(this.materialForm, 'material_spec', row.material_spec)
-      this.materialForm.material_name = row.material_name
-      this.materialForm.material_spec = row.material_spec
     },
     materiValueCancel(){
       this.updateForm = {}

mes/qd/src/views/wms/masterdata_manage/master/supp/index.vue

@@ -282,7 +282,7 @@ export default {
       })
     },
     getClass() {
-      crudClassstandard.getClass({ enabled: true, 'base_data_type': '04' }).then(res => {
+      crudClassstandard.queryClassById({ enabled: true, 'class_idStr': '1704039126057226240' }).then(res => {
         this.classes = res.content.map(function(obj) {
           if (obj.hasChildren) {
             obj.children = null

mes/qd/src/views/wms/pdm/device/index.vue

@@ -62,17 +62,17 @@
 <!--        >-->
 <!--          设备详情-->
 <!--        </el-button>-->
-        <el-button
+<!--        <el-button-->
-          slot="right"
+<!--          slot="right"-->
-          class="filter-item"
+<!--          class="filter-item"-->
-          type="warning"
+<!--          type="warning"-->
-          icon="el-icon-document-copy"
+<!--          icon="el-icon-document-copy"-->
-          :disabled="crud.selections.length !== 1"
+<!--          :disabled="crud.selections.length !== 1"-->
-          size="mini"
+<!--          size="mini"-->
-          @click="copyAdd(crud.selections[0])"
+<!--          @click="copyAdd(crud.selections[0])"-->
-        >
+<!--        >-->
-          复制新增
+<!--          复制新增-->
-        </el-button>
+<!--        </el-button>-->
       </crudOperation>
       <!--表单组件-->
       <el-dialog