基础资料部分去除无用引入

eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/repository/IncomeCategoryRepository.java

@@ -1,7 +1,6 @@
 package me.zhengjie.modules.wms.bd.repository;
 
 import me.zhengjie.modules.wms.bd.domain.IncomeCategory;
-import me.zhengjie.modules.wms.bd.domain.MeasureUnit;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/repository/MaterialCategoryRepository.java

@@ -1,6 +1,5 @@
 package me.zhengjie.modules.wms.bd.repository;
 
-import me.zhengjie.modules.wms.bd.domain.IncomeCategory;
 import me.zhengjie.modules.wms.bd.domain.MaterialCategory;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/repository/ProductCategoryRepository.java

@@ -1,6 +1,5 @@
 package me.zhengjie.modules.wms.bd.repository;
 
-import me.zhengjie.modules.wms.bd.domain.IncomeCategory;
 import me.zhengjie.modules.wms.bd.domain.ProductCategory;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/repository/SpendCategoryRepository.java

@@ -1,6 +1,5 @@
 package me.zhengjie.modules.wms.bd.repository;
 
-import me.zhengjie.modules.wms.bd.domain.IncomeCategory;
 import me.zhengjie.modules.wms.bd.domain.SpendCategory;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/repository/SupplierCategoryRepository.java

@@ -1,6 +1,5 @@
 package me.zhengjie.modules.wms.bd.repository;
 
-import me.zhengjie.modules.wms.bd.domain.IncomeCategory;
 import me.zhengjie.modules.wms.bd.domain.SupplierCategory;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/repository/WareHouseRepository.java

@@ -1,6 +1,5 @@
 package me.zhengjie.modules.wms.bd.repository;
 
-import me.zhengjie.modules.wms.bd.domain.IncomeCategory;
 import me.zhengjie.modules.wms.bd.domain.WareHouse;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/IncomeCategoryController.java

@@ -3,11 +3,8 @@ package me.zhengjie.modules.wms.bd.rest;
 import me.zhengjie.aop.log.Log;
 import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.modules.wms.bd.domain.IncomeCategory;
-import me.zhengjie.modules.wms.bd.domain.MeasureUnit;
 import me.zhengjie.modules.wms.bd.service.IncomeCategoryService;
-import me.zhengjie.modules.wms.bd.service.MeasureUnitService;
 import me.zhengjie.modules.wms.bd.service.dto.IncomeCategoryDTO;
-import me.zhengjie.modules.wms.bd.service.dto.MeasureUnitDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;

eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/MaterialCategoryController.java

@@ -3,11 +3,8 @@ package me.zhengjie.modules.wms.bd.rest;
 import me.zhengjie.aop.log.Log;
 import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.modules.wms.bd.domain.MaterialCategory;
-import me.zhengjie.modules.wms.bd.domain.MeasureUnit;
 import me.zhengjie.modules.wms.bd.service.MaterialCategoryService;
-import me.zhengjie.modules.wms.bd.service.MeasureUnitService;
 import me.zhengjie.modules.wms.bd.service.dto.MaterialCategoryDTO;
-import me.zhengjie.modules.wms.bd.service.dto.MeasureUnitDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -30,7 +27,7 @@ public class MaterialCategoryController {
     private static final String ENTITY_NAME = "materialCategory";
 
     @Log("新增物料类别")
-    @PostMapping(value = "/measureUnit")
+    @PostMapping(value = "/materialCategory")
     public ResponseEntity create(@Validated @RequestBody MaterialCategory resources){
         if (resources.getId() != null) {
             throw new BadRequestException("A new "+ ENTITY_NAME +" cannot already have an ID");
@@ -39,20 +36,20 @@ public class MaterialCategoryController {
     }
 
     @Log("查看物料类别")
-    @GetMapping(value = "/measureUnit/{id}")
+    @GetMapping(value = "/materialCategory/{id}")
     public ResponseEntity getMessureUnits(@PathVariable Long id){
         return new ResponseEntity(materialCategoryService.findById(id), HttpStatus.OK);
     }
 
     @Log("删除物料类别")
-    @DeleteMapping(value = "/measureUnit/{id}")
+    @DeleteMapping(value = "/materialCategory/{id}")
     public ResponseEntity delete(@PathVariable Long id){
         materialCategoryService.delete(id);
         return new ResponseEntity(HttpStatus.OK);
     }
 
     @Log("查询物料类别")
-    @GetMapping(value = "/measureUnit")
+    @GetMapping(value = "/materialCategory")
     public ResponseEntity getDicts(MaterialCategoryDTO resources, Pageable pageable){
         return new ResponseEntity(materialCategoryService.queryAll(resources,pageable),HttpStatus.OK);
     }

eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/MeasureUnitController.java

@@ -2,12 +2,9 @@ package me.zhengjie.modules.wms.bd.rest;
 
 import me.zhengjie.aop.log.Log;
 import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.system.service.dto.DictDTO;
-import me.zhengjie.modules.system.service.dto.RoleSmallDTO;
 import me.zhengjie.modules.wms.bd.domain.MeasureUnit;
 import me.zhengjie.modules.wms.bd.service.MeasureUnitService;
 import me.zhengjie.modules.wms.bd.service.dto.MeasureUnitDTO;
-import me.zhengjie.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;

eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/ProductCategoryController.java

@@ -2,11 +2,8 @@ package me.zhengjie.modules.wms.bd.rest;
 
 import me.zhengjie.aop.log.Log;
 import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.wms.bd.domain.MeasureUnit;
 import me.zhengjie.modules.wms.bd.domain.ProductCategory;
-import me.zhengjie.modules.wms.bd.service.MeasureUnitService;
 import me.zhengjie.modules.wms.bd.service.ProductCategoryService;
-import me.zhengjie.modules.wms.bd.service.dto.MeasureUnitDTO;
 import me.zhengjie.modules.wms.bd.service.dto.ProductCategoryDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;

eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/SpendCategoryController.java

@@ -2,11 +2,8 @@ package me.zhengjie.modules.wms.bd.rest;
 
 import me.zhengjie.aop.log.Log;
 import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.wms.bd.domain.MeasureUnit;
 import me.zhengjie.modules.wms.bd.domain.SpendCategory;
-import me.zhengjie.modules.wms.bd.service.MeasureUnitService;
 import me.zhengjie.modules.wms.bd.service.SpendCategoryService;
-import me.zhengjie.modules.wms.bd.service.dto.MeasureUnitDTO;
 import me.zhengjie.modules.wms.bd.service.dto.SpendCategoryDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;

eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/SupplierCategoryController.java

@@ -2,11 +2,8 @@ package me.zhengjie.modules.wms.bd.rest;
 
 import me.zhengjie.aop.log.Log;
 import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.wms.bd.domain.MeasureUnit;
 import me.zhengjie.modules.wms.bd.domain.SupplierCategory;
-import me.zhengjie.modules.wms.bd.service.MeasureUnitService;
 import me.zhengjie.modules.wms.bd.service.SupplierCategoryService;
-import me.zhengjie.modules.wms.bd.service.dto.MeasureUnitDTO;
 import me.zhengjie.modules.wms.bd.service.dto.SupplierCategoryDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;

eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/WareHouseController.java

@@ -2,11 +2,8 @@ package me.zhengjie.modules.wms.bd.rest;
 
 import me.zhengjie.aop.log.Log;
 import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.wms.bd.domain.MeasureUnit;
 import me.zhengjie.modules.wms.bd.domain.WareHouse;
-import me.zhengjie.modules.wms.bd.service.MeasureUnitService;
 import me.zhengjie.modules.wms.bd.service.WareHouseService;
-import me.zhengjie.modules.wms.bd.service.dto.MeasureUnitDTO;
 import me.zhengjie.modules.wms.bd.service.dto.WareHouseDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
@@ -30,7 +27,7 @@ public class WareHouseController {
     private static final String ENTITY_NAME = "wareHouse";
 
     @Log("新增仓库")
-    @PostMapping(value = "/warehouse")
+    @PostMapping(value = "/wareHouse")
     public ResponseEntity create(@Validated @RequestBody WareHouse resources){
         if (resources.getId() != null) {
             throw new BadRequestException("A new "+ ENTITY_NAME +" cannot already have an ID");
@@ -39,20 +36,20 @@ public class WareHouseController {
     }
 
     @Log("查看仓库详情")
-    @GetMapping(value = "/warehouse/{id}")
+    @GetMapping(value = "/wareHouse/{id}")
     public ResponseEntity getMessureUnits(@PathVariable Long id){
         return new ResponseEntity(wareHouseService.findById(id), HttpStatus.OK);
     }
 
     @Log("删除仓库")
-    @DeleteMapping(value = "/warehouse/{id}")
+    @DeleteMapping(value = "/wareHouse/{id}")
     public ResponseEntity delete(@PathVariable Long id){
         wareHouseService.delete(id);
         return new ResponseEntity(HttpStatus.OK);
     }
 
     @Log("查询仓库")
-    @GetMapping(value = "/warehouse")
+    @GetMapping(value = "/wareHouse")
     public ResponseEntity getDicts(WareHouseDTO resources, Pageable pageable){
         return new ResponseEntity(wareHouseService.queryAll(resources,pageable),HttpStatus.OK);
     }

eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/ProductCategoryService.java

@@ -1,8 +1,6 @@
 package me.zhengjie.modules.wms.bd.service;
 
-import me.zhengjie.modules.wms.bd.domain.MeasureUnit;
 import me.zhengjie.modules.wms.bd.domain.ProductCategory;
-import me.zhengjie.modules.wms.bd.service.dto.MeasureUnitDTO;
 import me.zhengjie.modules.wms.bd.service.dto.ProductCategoryDTO;
 import org.springframework.data.domain.Pageable;
 

eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/impl/IncomeCategoryServiceImpl.java

@@ -1,15 +1,10 @@
 package me.zhengjie.modules.wms.bd.service.impl;
 
 import me.zhengjie.modules.wms.bd.domain.IncomeCategory;
-import me.zhengjie.modules.wms.bd.domain.MeasureUnit;
 import me.zhengjie.modules.wms.bd.repository.IncomeCategoryRepository;
-import me.zhengjie.modules.wms.bd.repository.MeasureUnitRepository;
 import me.zhengjie.modules.wms.bd.service.IncomeCategoryService;
-import me.zhengjie.modules.wms.bd.service.MeasureUnitService;
 import me.zhengjie.modules.wms.bd.service.dto.IncomeCategoryDTO;
-import me.zhengjie.modules.wms.bd.service.dto.MeasureUnitDTO;
 import me.zhengjie.modules.wms.bd.service.mapper.IncomeCategoryMapper;
-import me.zhengjie.modules.wms.bd.service.mapper.MeasureUnitMapper;
 import me.zhengjie.utils.PageUtil;
 import me.zhengjie.utils.QueryHelp;
 import me.zhengjie.utils.ValidationUtil;

eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/impl/MaterialCategoryServiceImpl.java

@@ -1,14 +1,9 @@
 package me.zhengjie.modules.wms.bd.service.impl;
 
-import me.zhengjie.modules.wms.bd.domain.IncomeCategory;
 import me.zhengjie.modules.wms.bd.domain.MaterialCategory;
-import me.zhengjie.modules.wms.bd.repository.IncomeCategoryRepository;
 import me.zhengjie.modules.wms.bd.repository.MaterialCategoryRepository;
-import me.zhengjie.modules.wms.bd.service.IncomeCategoryService;
 import me.zhengjie.modules.wms.bd.service.MaterialCategoryService;
-import me.zhengjie.modules.wms.bd.service.dto.IncomeCategoryDTO;
 import me.zhengjie.modules.wms.bd.service.dto.MaterialCategoryDTO;
-import me.zhengjie.modules.wms.bd.service.mapper.IncomeCategoryMapper;
 import me.zhengjie.modules.wms.bd.service.mapper.MaterialCategoryMapper;
 import me.zhengjie.utils.PageUtil;
 import me.zhengjie.utils.QueryHelp;

eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/impl/MeasureUnitServiceImpl.java

@@ -1,6 +1,5 @@
 package me.zhengjie.modules.wms.bd.service.impl;
 
-import me.zhengjie.modules.system.domain.Dict;
 import me.zhengjie.modules.wms.bd.domain.MeasureUnit;
 import me.zhengjie.modules.wms.bd.repository.MeasureUnitRepository;
 import me.zhengjie.modules.wms.bd.service.MeasureUnitService;

eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/impl/ProductCategoryServiceImpl.java

@@ -1,14 +1,9 @@
 package me.zhengjie.modules.wms.bd.service.impl;
 
-import me.zhengjie.modules.wms.bd.domain.MaterialCategory;
 import me.zhengjie.modules.wms.bd.domain.ProductCategory;
-import me.zhengjie.modules.wms.bd.repository.MaterialCategoryRepository;
 import me.zhengjie.modules.wms.bd.repository.ProductCategoryRepository;
-import me.zhengjie.modules.wms.bd.service.MaterialCategoryService;
 import me.zhengjie.modules.wms.bd.service.ProductCategoryService;
-import me.zhengjie.modules.wms.bd.service.dto.MaterialCategoryDTO;
 import me.zhengjie.modules.wms.bd.service.dto.ProductCategoryDTO;
-import me.zhengjie.modules.wms.bd.service.mapper.MaterialCategoryMapper;
 import me.zhengjie.modules.wms.bd.service.mapper.ProductCategoryMapper;
 import me.zhengjie.utils.PageUtil;
 import me.zhengjie.utils.QueryHelp;

eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/impl/SpendCategoryServiceImpl.java

@@ -1,14 +1,9 @@
 package me.zhengjie.modules.wms.bd.service.impl;
 
-import me.zhengjie.modules.wms.bd.domain.ProductCategory;
 import me.zhengjie.modules.wms.bd.domain.SpendCategory;
-import me.zhengjie.modules.wms.bd.repository.ProductCategoryRepository;
 import me.zhengjie.modules.wms.bd.repository.SpendCategoryRepository;
-import me.zhengjie.modules.wms.bd.service.ProductCategoryService;
 import me.zhengjie.modules.wms.bd.service.SpendCategoryService;
-import me.zhengjie.modules.wms.bd.service.dto.ProductCategoryDTO;
 import me.zhengjie.modules.wms.bd.service.dto.SpendCategoryDTO;
-import me.zhengjie.modules.wms.bd.service.mapper.ProductCategoryMapper;
 import me.zhengjie.modules.wms.bd.service.mapper.SpendCategoryMapper;
 import me.zhengjie.utils.PageUtil;
 import me.zhengjie.utils.QueryHelp;

eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/impl/SupplierCategoryServiceImpl.java

@@ -1,14 +1,9 @@
 package me.zhengjie.modules.wms.bd.service.impl;
 
-import me.zhengjie.modules.wms.bd.domain.SpendCategory;
 import me.zhengjie.modules.wms.bd.domain.SupplierCategory;
-import me.zhengjie.modules.wms.bd.repository.SpendCategoryRepository;
 import me.zhengjie.modules.wms.bd.repository.SupplierCategoryRepository;
-import me.zhengjie.modules.wms.bd.service.SpendCategoryService;
 import me.zhengjie.modules.wms.bd.service.SupplierCategoryService;
-import me.zhengjie.modules.wms.bd.service.dto.SpendCategoryDTO;
 import me.zhengjie.modules.wms.bd.service.dto.SupplierCategoryDTO;
-import me.zhengjie.modules.wms.bd.service.mapper.SpendCategoryMapper;
 import me.zhengjie.modules.wms.bd.service.mapper.SupplierCategoryMapper;
 import me.zhengjie.utils.PageUtil;
 import me.zhengjie.utils.QueryHelp;

eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/impl/WareHouseServiceImpl.java

@@ -1,14 +1,9 @@
 package me.zhengjie.modules.wms.bd.service.impl;
 
-import me.zhengjie.modules.wms.bd.domain.SupplierCategory;
 import me.zhengjie.modules.wms.bd.domain.WareHouse;
-import me.zhengjie.modules.wms.bd.repository.SupplierCategoryRepository;
 import me.zhengjie.modules.wms.bd.repository.WareHouseRepository;
-import me.zhengjie.modules.wms.bd.service.SupplierCategoryService;
 import me.zhengjie.modules.wms.bd.service.WareHouseService;
-import me.zhengjie.modules.wms.bd.service.dto.SupplierCategoryDTO;
 import me.zhengjie.modules.wms.bd.service.dto.WareHouseDTO;
-import me.zhengjie.modules.wms.bd.service.mapper.SupplierCategoryMapper;
 import me.zhengjie.modules.wms.bd.service.mapper.WareHouseMapper;
 import me.zhengjie.utils.PageUtil;
 import me.zhengjie.utils.QueryHelp;

eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/mapper/IncomeCategoryMapper.java

@@ -2,9 +2,7 @@ package me.zhengjie.modules.wms.bd.service.mapper;
 
 import me.zhengjie.mapper.EntityMapper;
 import me.zhengjie.modules.wms.bd.domain.IncomeCategory;
-import me.zhengjie.modules.wms.bd.domain.MeasureUnit;
 import me.zhengjie.modules.wms.bd.service.dto.IncomeCategoryDTO;
-import me.zhengjie.modules.wms.bd.service.dto.MeasureUnitDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 

eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/mapper/MaterialCategoryMapper.java

@@ -1,9 +1,7 @@
 package me.zhengjie.modules.wms.bd.service.mapper;
 
 import me.zhengjie.mapper.EntityMapper;
-import me.zhengjie.modules.wms.bd.domain.IncomeCategory;
 import me.zhengjie.modules.wms.bd.domain.MaterialCategory;
-import me.zhengjie.modules.wms.bd.service.dto.IncomeCategoryDTO;
 import me.zhengjie.modules.wms.bd.service.dto.MaterialCategoryDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;

eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/mapper/ProductCategoryMapper.java

@@ -1,9 +1,7 @@
 package me.zhengjie.modules.wms.bd.service.mapper;
 
 import me.zhengjie.mapper.EntityMapper;
-import me.zhengjie.modules.wms.bd.domain.MaterialCategory;
 import me.zhengjie.modules.wms.bd.domain.ProductCategory;
-import me.zhengjie.modules.wms.bd.service.dto.MaterialCategoryDTO;
 import me.zhengjie.modules.wms.bd.service.dto.ProductCategoryDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;

eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/mapper/SpendCategoryMapper.java

@@ -1,9 +1,7 @@
 package me.zhengjie.modules.wms.bd.service.mapper;
 
 import me.zhengjie.mapper.EntityMapper;
-import me.zhengjie.modules.wms.bd.domain.ProductCategory;
 import me.zhengjie.modules.wms.bd.domain.SpendCategory;
-import me.zhengjie.modules.wms.bd.service.dto.ProductCategoryDTO;
 import me.zhengjie.modules.wms.bd.service.dto.SpendCategoryDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;

eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/mapper/SupplierCategoryMapper.java

@@ -1,9 +1,7 @@
 package me.zhengjie.modules.wms.bd.service.mapper;
 
 import me.zhengjie.mapper.EntityMapper;
-import me.zhengjie.modules.wms.bd.domain.SpendCategory;
 import me.zhengjie.modules.wms.bd.domain.SupplierCategory;
-import me.zhengjie.modules.wms.bd.service.dto.SpendCategoryDTO;
 import me.zhengjie.modules.wms.bd.service.dto.SupplierCategoryDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;

eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/mapper/WareHouseMapper.java

@@ -1,9 +1,7 @@
 package me.zhengjie.modules.wms.bd.service.mapper;
 
 import me.zhengjie.mapper.EntityMapper;
-import me.zhengjie.modules.wms.bd.domain.SpendCategory;
 import me.zhengjie.modules.wms.bd.domain.WareHouse;
-import me.zhengjie.modules.wms.bd.service.dto.SpendCategoryDTO;
 import me.zhengjie.modules.wms.bd.service.dto.WareHouseDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;