diff --git a/src/main/java/com/niuan/erp/module/auth/service/CustomUserDetailsService.java b/src/main/java/com/niuan/erp/module/auth/service/CustomUserDetailsService.java index e7fffa2..5d898fd 100644 --- a/src/main/java/com/niuan/erp/module/auth/service/CustomUserDetailsService.java +++ b/src/main/java/com/niuan/erp/module/auth/service/CustomUserDetailsService.java @@ -5,11 +5,8 @@ import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; import com.niuan.erp.common.base.LoginUser; import com.niuan.erp.common.exception.BusinessException; -import com.niuan.erp.module.sys.entity.SysChannel; -import com.niuan.erp.module.sys.entity.SysPermission; import com.niuan.erp.module.sys.entity.SysRole; import com.niuan.erp.module.sys.entity.SysUser; -import com.niuan.erp.module.sys.mapper.SysChannelMapper; import com.niuan.erp.module.sys.mapper.SysPermissionMapper; import com.niuan.erp.module.sys.mapper.SysRoleMapper; import com.niuan.erp.module.sys.mapper.SysUserMapper; diff --git a/src/main/java/com/niuan/erp/module/auth/service/impl/SystemAuthServiceImpl.java b/src/main/java/com/niuan/erp/module/auth/service/impl/SystemAuthServiceImpl.java index 96ae64d..d5f0e16 100644 --- a/src/main/java/com/niuan/erp/module/auth/service/impl/SystemAuthServiceImpl.java +++ b/src/main/java/com/niuan/erp/module/auth/service/impl/SystemAuthServiceImpl.java @@ -1,11 +1,9 @@ package com.niuan.erp.module.auth.service.impl; -import com.niuan.erp.common.base.LoginUser; import com.niuan.erp.common.utils.SecurityUtils; import com.niuan.erp.common.utils.SystemAuthFactory; import com.niuan.erp.module.auth.controller.dto.RouterConfigRaw; import com.niuan.erp.module.auth.service.SystemAuthService; -import com.niuan.erp.module.sys.entity.SysChannel; import com.niuan.erp.module.sys.entity.SysPermission; import com.niuan.erp.module.sys.mapper.SysChannelMapper; import com.niuan.erp.module.sys.mapper.SysPermissionMapper; diff --git a/src/main/java/com/niuan/erp/module/common/mapper/DocumentMaterialMapper.java b/src/main/java/com/niuan/erp/module/common/mapper/DocumentMaterialMapper.java index d52c964..2e2bdca 100644 --- a/src/main/java/com/niuan/erp/module/common/mapper/DocumentMaterialMapper.java +++ b/src/main/java/com/niuan/erp/module/common/mapper/DocumentMaterialMapper.java @@ -3,10 +3,8 @@ package com.niuan.erp.module.common.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.niuan.erp.module.common.entity.DocumentMaterial; import com.niuan.erp.module.common.entity.DocumentMaterialWithInfo; -import com.niuan.erp.module.common.enums.DocumentType; import java.util.List; -import java.util.Map; /** *

diff --git a/src/main/java/com/niuan/erp/module/production/controller/FinishedProductShipmentController.java b/src/main/java/com/niuan/erp/module/production/controller/FinishedProductShipmentController.java index 831f38b..35913f6 100644 --- a/src/main/java/com/niuan/erp/module/production/controller/FinishedProductShipmentController.java +++ b/src/main/java/com/niuan/erp/module/production/controller/FinishedProductShipmentController.java @@ -4,12 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.niuan.erp.common.annotation.ApiLog; import com.niuan.erp.common.annotation.ModuleLog; -import com.niuan.erp.common.base.BaseApproveAndRejectDto; -import com.niuan.erp.common.base.BaseDeleteBody; -import com.niuan.erp.common.base.BasePageReqParams; -import com.niuan.erp.common.base.BaseResult; -import com.niuan.erp.common.base.CommonValidateGroup.*; -import com.niuan.erp.common.base.OperationType; +import com.niuan.erp.common.base.*; +import com.niuan.erp.common.base.CommonValidateGroup.Add; +import com.niuan.erp.common.base.CommonValidateGroup.DeleteOne; +import com.niuan.erp.common.base.CommonValidateGroup.Get; +import com.niuan.erp.common.base.CommonValidateGroup.Update; import com.niuan.erp.module.common.entity.Document; import com.niuan.erp.module.production.controller.dto.FinishedProductShipmentAddDto; import com.niuan.erp.module.production.controller.dto.FinishedProductShipmentDto; diff --git a/src/main/java/com/niuan/erp/module/production/controller/ProductionIssueController.java b/src/main/java/com/niuan/erp/module/production/controller/ProductionIssueController.java index 5b8481f..2524a9e 100644 --- a/src/main/java/com/niuan/erp/module/production/controller/ProductionIssueController.java +++ b/src/main/java/com/niuan/erp/module/production/controller/ProductionIssueController.java @@ -4,8 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.niuan.erp.common.annotation.ApiLog; import com.niuan.erp.common.annotation.ModuleLog; -import com.niuan.erp.common.base.*; -import com.niuan.erp.common.base.CommonValidateGroup.*; +import com.niuan.erp.common.base.BaseApproveAndRejectDto; +import com.niuan.erp.common.base.BasePageReqParams; +import com.niuan.erp.common.base.BaseResult; +import com.niuan.erp.common.base.CommonValidateGroup.Get; +import com.niuan.erp.common.base.CommonValidateGroup.Update; +import com.niuan.erp.common.base.OperationType; import com.niuan.erp.module.common.entity.Document; import com.niuan.erp.module.production.controller.dto.ProductionIssueAddDto; import com.niuan.erp.module.production.controller.dto.ProductionIssueDto; diff --git a/src/main/java/com/niuan/erp/module/production/controller/ProductionReturnController.java b/src/main/java/com/niuan/erp/module/production/controller/ProductionReturnController.java index de661b5..9dbd579 100644 --- a/src/main/java/com/niuan/erp/module/production/controller/ProductionReturnController.java +++ b/src/main/java/com/niuan/erp/module/production/controller/ProductionReturnController.java @@ -5,10 +5,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.niuan.erp.common.annotation.ApiLog; import com.niuan.erp.common.annotation.ModuleLog; import com.niuan.erp.common.base.BaseApproveAndRejectDto; -import com.niuan.erp.common.base.BaseDeleteBody; import com.niuan.erp.common.base.BasePageReqParams; import com.niuan.erp.common.base.BaseResult; -import com.niuan.erp.common.base.CommonValidateGroup.*; +import com.niuan.erp.common.base.CommonValidateGroup.Get; import com.niuan.erp.common.base.OperationType; import com.niuan.erp.module.common.entity.Document; import com.niuan.erp.module.common.enums.DocumentType; diff --git a/src/main/java/com/niuan/erp/module/production/controller/dto/FinishedProductShipmentDto.java b/src/main/java/com/niuan/erp/module/production/controller/dto/FinishedProductShipmentDto.java index 9ce2794..0f09428 100644 --- a/src/main/java/com/niuan/erp/module/production/controller/dto/FinishedProductShipmentDto.java +++ b/src/main/java/com/niuan/erp/module/production/controller/dto/FinishedProductShipmentDto.java @@ -2,6 +2,7 @@ package com.niuan.erp.module.production.controller.dto; import com.niuan.erp.module.production.enums.OutStockType; import io.swagger.v3.oas.annotations.media.Schema; + import java.time.LocalDateTime; @Schema(description = "成品出库DTO") diff --git a/src/main/java/com/niuan/erp/module/production/entity/ProduceOrderList.java b/src/main/java/com/niuan/erp/module/production/entity/ProduceOrderList.java index c1efd26..4a5b200 100644 --- a/src/main/java/com/niuan/erp/module/production/entity/ProduceOrderList.java +++ b/src/main/java/com/niuan/erp/module/production/entity/ProduceOrderList.java @@ -1,6 +1,7 @@ package com.niuan.erp.module.production.entity; import lombok.Data; + import java.io.Serializable; @Data diff --git a/src/main/java/com/niuan/erp/module/production/enums/ProductionPlanStatus.java b/src/main/java/com/niuan/erp/module/production/enums/ProductionPlanStatus.java index 0a42a36..527a8e6 100644 --- a/src/main/java/com/niuan/erp/module/production/enums/ProductionPlanStatus.java +++ b/src/main/java/com/niuan/erp/module/production/enums/ProductionPlanStatus.java @@ -1,7 +1,6 @@ package com.niuan.erp.module.production.enums; import com.baomidou.mybatisplus.annotation.IEnum; -import com.niuan.erp.common.base.BaseStatus; public enum ProductionPlanStatus implements IEnum { NoComplete(0, "未完成"), diff --git a/src/main/java/com/niuan/erp/module/production/mapper/ProductionPlanMapper.java b/src/main/java/com/niuan/erp/module/production/mapper/ProductionPlanMapper.java index 0e2421a..7c58f6e 100644 --- a/src/main/java/com/niuan/erp/module/production/mapper/ProductionPlanMapper.java +++ b/src/main/java/com/niuan/erp/module/production/mapper/ProductionPlanMapper.java @@ -4,11 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.niuan.erp.module.production.controller.dto.ProductionPlanShortageDto; import com.niuan.erp.module.production.entity.ProduceOrderList; import com.niuan.erp.module.production.entity.ProductionPlan; -import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Map; /** *

diff --git a/src/main/java/com/niuan/erp/module/production/service/FinishedProductReceiptService.java b/src/main/java/com/niuan/erp/module/production/service/FinishedProductReceiptService.java index d759e66..5035c8c 100644 --- a/src/main/java/com/niuan/erp/module/production/service/FinishedProductReceiptService.java +++ b/src/main/java/com/niuan/erp/module/production/service/FinishedProductReceiptService.java @@ -8,7 +8,6 @@ import com.niuan.erp.module.production.controller.dto.DeviceOutstockRequest; import com.niuan.erp.module.production.controller.dto.FinishedProductReceiptAddDto; import com.niuan.erp.module.production.controller.dto.FinishedProductReceiptDto; import com.niuan.erp.module.sale.controller.dto.DeviceDto; -import org.springframework.web.multipart.MultipartFile; import java.util.List; diff --git a/src/main/java/com/niuan/erp/module/production/service/FinishedProductShipmentService.java b/src/main/java/com/niuan/erp/module/production/service/FinishedProductShipmentService.java index f02af03..1f08236 100644 --- a/src/main/java/com/niuan/erp/module/production/service/FinishedProductShipmentService.java +++ b/src/main/java/com/niuan/erp/module/production/service/FinishedProductShipmentService.java @@ -7,7 +7,6 @@ import com.niuan.erp.module.common.entity.Document; import com.niuan.erp.module.production.controller.dto.FinishedProductShipmentAddDto; import com.niuan.erp.module.production.controller.dto.FinishedProductShipmentDto; import com.niuan.erp.module.production.controller.dto.FinishedProductShipmentItemDto; -import org.springframework.web.multipart.MultipartFile; import java.util.List; diff --git a/src/main/java/com/niuan/erp/module/production/service/ProductionIssueService.java b/src/main/java/com/niuan/erp/module/production/service/ProductionIssueService.java index 1e581be..9fea915 100644 --- a/src/main/java/com/niuan/erp/module/production/service/ProductionIssueService.java +++ b/src/main/java/com/niuan/erp/module/production/service/ProductionIssueService.java @@ -6,7 +6,6 @@ import com.niuan.erp.common.base.BasePageReqParams; import com.niuan.erp.module.common.entity.Document; import com.niuan.erp.module.production.controller.dto.ProductionIssueAddDto; import com.niuan.erp.module.production.controller.dto.ProductionIssueDto; -import com.niuan.erp.module.production.controller.dto.ProductionIssueItemAddDto; import com.niuan.erp.module.production.controller.dto.ProductionIssueItemDto; import java.util.List; diff --git a/src/main/java/com/niuan/erp/module/production/service/ProductionPlanService.java b/src/main/java/com/niuan/erp/module/production/service/ProductionPlanService.java index 085b8cd..21b6547 100644 --- a/src/main/java/com/niuan/erp/module/production/service/ProductionPlanService.java +++ b/src/main/java/com/niuan/erp/module/production/service/ProductionPlanService.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.niuan.erp.common.base.BasePageReqParams; import com.niuan.erp.module.production.controller.dto.PlanProductionIssueAddDto; -import com.niuan.erp.module.production.controller.dto.ProductionIssueAddDto; import com.niuan.erp.module.production.controller.dto.ProductionPlanDto; import com.niuan.erp.module.production.controller.dto.ProductionPlanShortageDto; import com.niuan.erp.module.production.entity.ProductionPlan; diff --git a/src/main/java/com/niuan/erp/module/production/service/impl/BomServiceImpl.java b/src/main/java/com/niuan/erp/module/production/service/impl/BomServiceImpl.java index ff01f9d..a2bcf42 100644 --- a/src/main/java/com/niuan/erp/module/production/service/impl/BomServiceImpl.java +++ b/src/main/java/com/niuan/erp/module/production/service/impl/BomServiceImpl.java @@ -8,7 +8,10 @@ import com.niuan.erp.common.base.BasePageReqParams; import com.niuan.erp.common.base.BaseSelectDto; import com.niuan.erp.common.exception.BusinessException; import com.niuan.erp.common.utils.SecurityUtils; -import com.niuan.erp.module.production.controller.dto.*; +import com.niuan.erp.module.production.controller.dto.BomAddDto; +import com.niuan.erp.module.production.controller.dto.BomDto; +import com.niuan.erp.module.production.controller.dto.BomItemAddDto; +import com.niuan.erp.module.production.controller.dto.BomItemDto; import com.niuan.erp.module.production.converter.BomConverter; import com.niuan.erp.module.production.converter.BomItemConverter; import com.niuan.erp.module.production.entity.Bom; diff --git a/src/main/java/com/niuan/erp/module/production/service/impl/FinishedProductReceiptServiceImpl.java b/src/main/java/com/niuan/erp/module/production/service/impl/FinishedProductReceiptServiceImpl.java index 0c1fd8c..01b1bcd 100644 --- a/src/main/java/com/niuan/erp/module/production/service/impl/FinishedProductReceiptServiceImpl.java +++ b/src/main/java/com/niuan/erp/module/production/service/impl/FinishedProductReceiptServiceImpl.java @@ -24,13 +24,13 @@ import com.niuan.erp.module.sale.converter.DeviceConverter; import com.niuan.erp.module.sale.entity.Device; import com.niuan.erp.module.sale.mapper.DeviceMapper; import lombok.RequiredArgsConstructor; -import org.apache.poi.ss.usermodel.*; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.StringUtils; import java.time.LocalDateTime; -import java.util.*; +import java.util.HashSet; +import java.util.List; +import java.util.Set; import java.util.stream.Collectors; diff --git a/src/main/java/com/niuan/erp/module/production/service/impl/FinishedProductShipmentServiceImpl.java b/src/main/java/com/niuan/erp/module/production/service/impl/FinishedProductShipmentServiceImpl.java index a8ccd4d..3846f76 100644 --- a/src/main/java/com/niuan/erp/module/production/service/impl/FinishedProductShipmentServiceImpl.java +++ b/src/main/java/com/niuan/erp/module/production/service/impl/FinishedProductShipmentServiceImpl.java @@ -1,7 +1,6 @@ package com.niuan.erp.module.production.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -18,7 +17,6 @@ import com.niuan.erp.module.production.controller.dto.FinishedProductShipmentAdd import com.niuan.erp.module.production.controller.dto.FinishedProductShipmentDto; import com.niuan.erp.module.production.controller.dto.FinishedProductShipmentItemDto; import com.niuan.erp.module.production.converter.FinishedProductShipmentConverter; -import com.niuan.erp.module.production.enums.OutStockType; import com.niuan.erp.module.production.service.FinishedProductShipmentService; import com.niuan.erp.module.warehouse.entity.Stock; import com.niuan.erp.module.warehouse.entity.WarehouseItem; @@ -30,7 +28,10 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; import java.time.LocalDateTime; -import java.util.*; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.stream.Collectors; diff --git a/src/main/java/com/niuan/erp/module/production/service/impl/ProductionPlanServiceImpl.java b/src/main/java/com/niuan/erp/module/production/service/impl/ProductionPlanServiceImpl.java index a4e722f..2b663e4 100644 --- a/src/main/java/com/niuan/erp/module/production/service/impl/ProductionPlanServiceImpl.java +++ b/src/main/java/com/niuan/erp/module/production/service/impl/ProductionPlanServiceImpl.java @@ -8,7 +8,9 @@ import com.niuan.erp.common.base.BasePageReqParams; import com.niuan.erp.common.exception.BusinessException; import com.niuan.erp.common.utils.SecurityUtils; import com.niuan.erp.module.common.mapper.DocumentMapper; -import com.niuan.erp.module.production.controller.dto.*; +import com.niuan.erp.module.production.controller.dto.PlanProductionIssueAddDto; +import com.niuan.erp.module.production.controller.dto.ProductionPlanDto; +import com.niuan.erp.module.production.controller.dto.ProductionPlanShortageDto; import com.niuan.erp.module.production.converter.ProductionPlanConverter; import com.niuan.erp.module.production.entity.ProduceOrderList; import com.niuan.erp.module.production.entity.ProductionPlan; @@ -22,7 +24,8 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.Validator; import java.time.LocalDateTime; -import java.util.*; +import java.util.Arrays; +import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/com/niuan/erp/module/purchase/controller/dto/PurchaseOrderDto.java b/src/main/java/com/niuan/erp/module/purchase/controller/dto/PurchaseOrderDto.java index 33eef42..a01fcf3 100644 --- a/src/main/java/com/niuan/erp/module/purchase/controller/dto/PurchaseOrderDto.java +++ b/src/main/java/com/niuan/erp/module/purchase/controller/dto/PurchaseOrderDto.java @@ -1,7 +1,6 @@ package com.niuan.erp.module.purchase.controller.dto; import com.fasterxml.jackson.annotation.JsonInclude; -import com.niuan.erp.module.common.enums.FormStatus; import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDateTime; diff --git a/src/main/java/com/niuan/erp/module/purchase/controller/dto/PurchasePlanItemAddDto.java b/src/main/java/com/niuan/erp/module/purchase/controller/dto/PurchasePlanItemAddDto.java index 524aac5..a1147b2 100644 --- a/src/main/java/com/niuan/erp/module/purchase/controller/dto/PurchasePlanItemAddDto.java +++ b/src/main/java/com/niuan/erp/module/purchase/controller/dto/PurchasePlanItemAddDto.java @@ -3,8 +3,6 @@ package com.niuan.erp.module.purchase.controller.dto; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotNull; -import java.math.BigDecimal; - public record PurchasePlanItemAddDto( @NotNull(message = "purchase.purchase_plan.validate.part_number.not_null") String partNumber, diff --git a/src/main/java/com/niuan/erp/module/purchase/enums/PurchasePlanStatus.java b/src/main/java/com/niuan/erp/module/purchase/enums/PurchasePlanStatus.java index 66889d5..37b3bd8 100644 --- a/src/main/java/com/niuan/erp/module/purchase/enums/PurchasePlanStatus.java +++ b/src/main/java/com/niuan/erp/module/purchase/enums/PurchasePlanStatus.java @@ -1,7 +1,6 @@ package com.niuan.erp.module.purchase.enums; import com.baomidou.mybatisplus.annotation.IEnum; -import com.niuan.erp.common.base.BaseStatus; public enum PurchasePlanStatus implements IEnum { UNSTART(0, "未开始"), diff --git a/src/main/java/com/niuan/erp/module/purchase/service/PurchaseOrderService.java b/src/main/java/com/niuan/erp/module/purchase/service/PurchaseOrderService.java index a1dc215..415a84b 100644 --- a/src/main/java/com/niuan/erp/module/purchase/service/PurchaseOrderService.java +++ b/src/main/java/com/niuan/erp/module/purchase/service/PurchaseOrderService.java @@ -4,11 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.niuan.erp.common.base.BasePageReqParams; import com.niuan.erp.module.common.entity.Document; -import com.niuan.erp.module.purchase.controller.dto.PurchaseOrderAddDto; -import com.niuan.erp.module.purchase.controller.dto.PurchaseOrderDto; -import com.niuan.erp.module.purchase.controller.dto.PurchaseOrderInboundDto; -import com.niuan.erp.module.purchase.controller.dto.PurchaseOrderItemDto; -import com.niuan.erp.module.purchase.controller.dto.PurchaseOrderQrCodeDto; +import com.niuan.erp.module.purchase.controller.dto.*; import java.util.List; diff --git a/src/main/java/com/niuan/erp/module/purchase/service/PurchasePlanService.java b/src/main/java/com/niuan/erp/module/purchase/service/PurchasePlanService.java index 12c82ea..3aab484 100644 --- a/src/main/java/com/niuan/erp/module/purchase/service/PurchasePlanService.java +++ b/src/main/java/com/niuan/erp/module/purchase/service/PurchasePlanService.java @@ -3,11 +3,7 @@ package com.niuan.erp.module.purchase.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.niuan.erp.common.base.BasePageReqParams; -import com.niuan.erp.module.purchase.controller.dto.PurchasePlanAddDto; -import com.niuan.erp.module.purchase.controller.dto.PurchasePlanDto; -import com.niuan.erp.module.purchase.controller.dto.PurchasePlanItemDto; -import com.niuan.erp.module.purchase.controller.dto.PurchasePlanItemsWithVendorSuggestionsDto; -import com.niuan.erp.module.purchase.controller.dto.VendorSuggestionDto; +import com.niuan.erp.module.purchase.controller.dto.*; import com.niuan.erp.module.purchase.entity.PurchasePlan; import java.util.List; diff --git a/src/main/java/com/niuan/erp/module/purchase/service/impl/PurchaseOrderServiceImpl.java b/src/main/java/com/niuan/erp/module/purchase/service/impl/PurchaseOrderServiceImpl.java index bf4cea4..c10ad79 100644 --- a/src/main/java/com/niuan/erp/module/purchase/service/impl/PurchaseOrderServiceImpl.java +++ b/src/main/java/com/niuan/erp/module/purchase/service/impl/PurchaseOrderServiceImpl.java @@ -13,13 +13,7 @@ import com.niuan.erp.module.common.enums.DocumentType; import com.niuan.erp.module.common.enums.FormStatus; import com.niuan.erp.module.common.mapper.DocumentMapper; import com.niuan.erp.module.common.mapper.DocumentMaterialMapper; -import com.niuan.erp.module.purchase.controller.dto.PurchaseOrderAddDto; -import com.niuan.erp.module.purchase.controller.dto.PurchaseOrderDto; -import com.niuan.erp.module.purchase.controller.dto.PurchaseOrderInboundDto; -import com.niuan.erp.module.purchase.controller.dto.PurchaseOrderInboundItemDto; -import com.niuan.erp.module.purchase.controller.dto.PurchaseOrderItemAddDto; -import com.niuan.erp.module.purchase.controller.dto.PurchaseOrderItemDto; -import com.niuan.erp.module.purchase.controller.dto.PurchaseOrderQrCodeDto; +import com.niuan.erp.module.purchase.controller.dto.*; import com.niuan.erp.module.purchase.converter.PurchaseOrderConverter; import com.niuan.erp.module.purchase.converter.PurchaseOrderItemConverter; import com.niuan.erp.module.purchase.entity.PurchaseOrderItem; diff --git a/src/main/java/com/niuan/erp/module/purchase/service/impl/PurchasePlanServiceImpl.java b/src/main/java/com/niuan/erp/module/purchase/service/impl/PurchasePlanServiceImpl.java index 91ce680..7c21861 100644 --- a/src/main/java/com/niuan/erp/module/purchase/service/impl/PurchasePlanServiceImpl.java +++ b/src/main/java/com/niuan/erp/module/purchase/service/impl/PurchasePlanServiceImpl.java @@ -10,13 +10,7 @@ import com.niuan.erp.module.common.entity.Document; import com.niuan.erp.module.common.enums.DocumentType; import com.niuan.erp.module.common.enums.FormStatus; import com.niuan.erp.module.common.mapper.DocumentMapper; -import com.niuan.erp.module.purchase.controller.dto.PurchasePlanAddDto; -import com.niuan.erp.module.purchase.controller.dto.PurchasePlanDto; -import com.niuan.erp.module.purchase.controller.dto.PurchasePlanItemDto; -import com.niuan.erp.module.purchase.controller.dto.PurchasePlanItemsWithVendorSuggestionsDto; -import com.niuan.erp.module.purchase.controller.dto.VendorInfoDto; -import com.niuan.erp.module.purchase.controller.dto.VendorSuggestionDto; -import com.niuan.erp.module.purchase.controller.dto.PartVendorMappingDto; +import com.niuan.erp.module.purchase.controller.dto.*; import com.niuan.erp.module.purchase.converter.PurchasePlanConverter; import com.niuan.erp.module.purchase.converter.PurchasePlanItemConverter; import com.niuan.erp.module.purchase.entity.PurchaseOrderItem; @@ -41,11 +35,8 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.ArrayList; -import java.util.Comparator; -import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; diff --git a/src/main/java/com/niuan/erp/module/sale/controller/DeviceController.java b/src/main/java/com/niuan/erp/module/sale/controller/DeviceController.java index 9cd3bab..dda4b1c 100644 --- a/src/main/java/com/niuan/erp/module/sale/controller/DeviceController.java +++ b/src/main/java/com/niuan/erp/module/sale/controller/DeviceController.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.niuan.erp.common.annotation.ModuleLog; import com.niuan.erp.common.base.BasePageReqParams; import com.niuan.erp.common.base.BaseResult; -import com.niuan.erp.common.base.CommonValidateGroup.*; +import com.niuan.erp.common.base.CommonValidateGroup.Get; import com.niuan.erp.module.sale.controller.dto.DeviceQueryDto; import com.niuan.erp.module.sale.controller.dto.DeviceResultDto; import com.niuan.erp.module.sale.service.DeviceService; @@ -13,7 +13,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; @Tag(name = "SN溯源") @ModuleLog("SN溯源管理") diff --git a/src/main/java/com/niuan/erp/module/sale/controller/RepairRecordController.java b/src/main/java/com/niuan/erp/module/sale/controller/RepairRecordController.java index 1a388fa..ba84a87 100644 --- a/src/main/java/com/niuan/erp/module/sale/controller/RepairRecordController.java +++ b/src/main/java/com/niuan/erp/module/sale/controller/RepairRecordController.java @@ -5,7 +5,8 @@ import com.niuan.erp.common.annotation.ApiLog; import com.niuan.erp.common.annotation.ModuleLog; import com.niuan.erp.common.base.BasePageReqParams; import com.niuan.erp.common.base.BaseResult; -import com.niuan.erp.common.base.CommonValidateGroup.*; +import com.niuan.erp.common.base.CommonValidateGroup.Add; +import com.niuan.erp.common.base.CommonValidateGroup.Get; import com.niuan.erp.common.base.OperationType; import com.niuan.erp.module.sale.controller.dto.RepairRecordDto; import com.niuan.erp.module.sale.controller.dto.RepairRecordQueryDto; @@ -15,8 +16,8 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; @Tag(name = "返修报表") @ModuleLog("返修报表管理") diff --git a/src/main/java/com/niuan/erp/module/sale/service/impl/SaleOrderServiceImpl.java b/src/main/java/com/niuan/erp/module/sale/service/impl/SaleOrderServiceImpl.java index 2a09c9b..ff1fd65 100644 --- a/src/main/java/com/niuan/erp/module/sale/service/impl/SaleOrderServiceImpl.java +++ b/src/main/java/com/niuan/erp/module/sale/service/impl/SaleOrderServiceImpl.java @@ -12,12 +12,7 @@ import com.niuan.erp.module.common.entity.Document; import com.niuan.erp.module.common.enums.DocumentType; import com.niuan.erp.module.common.enums.FormStatus; import com.niuan.erp.module.common.mapper.DocumentMapper; -import com.niuan.erp.module.sale.controller.dto.SaleOrderAddDto; -import com.niuan.erp.module.sale.controller.dto.SaleOrderDto; -import com.niuan.erp.module.sale.controller.dto.SaleOrderItemAddDto; -import com.niuan.erp.module.sale.controller.dto.SaleOrderItemDto; -import com.niuan.erp.module.sale.controller.dto.SaleOrderItemUpdateDto; -import com.niuan.erp.module.sale.controller.dto.SaleOrderUpdateDto; +import com.niuan.erp.module.sale.controller.dto.*; import com.niuan.erp.module.sale.converter.SaleOrderConverter; import com.niuan.erp.module.sale.entity.SaleOrderItem; import com.niuan.erp.module.sale.mapper.SaleOrderItemMapper; diff --git a/src/main/java/com/niuan/erp/module/sys/service/impl/SysRoleServiceImpl.java b/src/main/java/com/niuan/erp/module/sys/service/impl/SysRoleServiceImpl.java index 73908d0..e396aac 100644 --- a/src/main/java/com/niuan/erp/module/sys/service/impl/SysRoleServiceImpl.java +++ b/src/main/java/com/niuan/erp/module/sys/service/impl/SysRoleServiceImpl.java @@ -60,7 +60,8 @@ public class SysRoleServiceImpl extends ServiceImpl impl return rp; }) .toList(); - rolePermissionMapper.insert(rolePermissions); + // 使用 saveBatch 批量插入，避免无主键实体使用 insert 方法的问题 + rolePermissions.forEach(rolePermissionMapper::insert); } } @@ -83,7 +84,8 @@ public class SysRoleServiceImpl extends ServiceImpl impl return rp; }) .toList(); - rolePermissionMapper.insert(newPermissions); + // 使用循环单条插入，避免无主键实体使用批量 insert 方法的问题 + newPermissions.forEach(rolePermissionMapper::insert); } } diff --git a/src/main/java/com/niuan/erp/module/warehouse/controller/InventoryCountController.java b/src/main/java/com/niuan/erp/module/warehouse/controller/InventoryCountController.java index ecce817..817b54a 100644 --- a/src/main/java/com/niuan/erp/module/warehouse/controller/InventoryCountController.java +++ b/src/main/java/com/niuan/erp/module/warehouse/controller/InventoryCountController.java @@ -7,7 +7,9 @@ import com.niuan.erp.common.annotation.ModuleLog; import com.niuan.erp.common.base.BaseDeleteBody; import com.niuan.erp.common.base.BasePageReqParams; import com.niuan.erp.common.base.BaseResult; -import com.niuan.erp.common.base.CommonValidateGroup.*; +import com.niuan.erp.common.base.CommonValidateGroup.Add; +import com.niuan.erp.common.base.CommonValidateGroup.DeleteOne; +import com.niuan.erp.common.base.CommonValidateGroup.Get; import com.niuan.erp.common.base.OperationType; import com.niuan.erp.module.common.entity.Document; import com.niuan.erp.module.warehouse.controller.dto.InventoryCountAddDto; @@ -22,10 +24,7 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.util.StringUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; import java.util.List; @Tag(name = "InventoryCount") diff --git a/src/main/java/com/niuan/erp/module/warehouse/controller/StockController.java b/src/main/java/com/niuan/erp/module/warehouse/controller/StockController.java index 1d7bf7e..9dd5f73 100644 --- a/src/main/java/com/niuan/erp/module/warehouse/controller/StockController.java +++ b/src/main/java/com/niuan/erp/module/warehouse/controller/StockController.java @@ -1,10 +1,9 @@ package com.niuan.erp.module.warehouse.controller; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.niuan.erp.common.annotation.ModuleLog; import com.niuan.erp.common.base.BasePageReqParams; import com.niuan.erp.common.base.BaseResult; -import com.niuan.erp.common.base.CommonValidateGroup.*; +import com.niuan.erp.common.base.CommonValidateGroup.Get; import com.niuan.erp.module.warehouse.controller.dto.StockDto; import com.niuan.erp.module.warehouse.service.StockService; import io.swagger.v3.oas.annotations.Operation; @@ -12,7 +11,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; @Tag(name = "Stock") @RestController diff --git a/src/main/java/com/niuan/erp/module/warehouse/converter/InventoryCountConverter.java b/src/main/java/com/niuan/erp/module/warehouse/converter/InventoryCountConverter.java index 3de90bb..7ba65da 100644 --- a/src/main/java/com/niuan/erp/module/warehouse/converter/InventoryCountConverter.java +++ b/src/main/java/com/niuan/erp/module/warehouse/converter/InventoryCountConverter.java @@ -7,7 +7,6 @@ import com.niuan.erp.module.warehouse.controller.dto.InventoryCountItemAddDto; import com.niuan.erp.module.warehouse.controller.dto.InventoryCountItemDto; import com.niuan.erp.module.warehouse.entity.InventoryCountItem; import org.mapstruct.Mapper; -import org.mapstruct.Mapping; import org.mapstruct.ReportingPolicy; import java.util.List; diff --git a/src/main/java/com/niuan/erp/module/warehouse/converter/StockTransferOrderConverter.java b/src/main/java/com/niuan/erp/module/warehouse/converter/StockTransferOrderConverter.java index dadf048..4963f1a 100644 --- a/src/main/java/com/niuan/erp/module/warehouse/converter/StockTransferOrderConverter.java +++ b/src/main/java/com/niuan/erp/module/warehouse/converter/StockTransferOrderConverter.java @@ -8,7 +8,6 @@ import com.niuan.erp.module.warehouse.controller.dto.StockTransferOrderDto; import com.niuan.erp.module.warehouse.controller.dto.StockTransferOrderItemAddDto; import com.niuan.erp.module.warehouse.controller.dto.StockTransferOrderItemDto; import org.mapstruct.Mapper; -import org.mapstruct.Mapping; import org.mapstruct.ReportingPolicy; import java.util.List; diff --git a/src/main/java/com/niuan/erp/module/warehouse/mapper/StockMapper.java b/src/main/java/com/niuan/erp/module/warehouse/mapper/StockMapper.java index 862a841..9f061a1 100644 --- a/src/main/java/com/niuan/erp/module/warehouse/mapper/StockMapper.java +++ b/src/main/java/com/niuan/erp/module/warehouse/mapper/StockMapper.java @@ -3,12 +3,8 @@ package com.niuan.erp.module.warehouse.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.niuan.erp.common.base.BasePageReqParams; import com.niuan.erp.module.warehouse.controller.dto.StockDto; import com.niuan.erp.module.warehouse.entity.Stock; -import org.apache.ibatis.annotations.Arg; -import org.apache.ibatis.annotations.ConstructorArgs; -import org.apache.ibatis.type.JdbcType; /** *

diff --git a/src/main/java/com/niuan/erp/module/warehouse/service/StockService.java b/src/main/java/com/niuan/erp/module/warehouse/service/StockService.java index d27148e..bf181d3 100644 --- a/src/main/java/com/niuan/erp/module/warehouse/service/StockService.java +++ b/src/main/java/com/niuan/erp/module/warehouse/service/StockService.java @@ -1,12 +1,8 @@ package com.niuan.erp.module.warehouse.service; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.niuan.erp.common.base.BasePageReqParams; import com.niuan.erp.module.warehouse.controller.dto.StockDto; -import com.niuan.erp.module.warehouse.entity.Stock; - -import java.util.List; public interface StockService { diff --git a/src/main/java/com/niuan/erp/module/warehouse/service/WarehouseItemService.java b/src/main/java/com/niuan/erp/module/warehouse/service/WarehouseItemService.java index f12c291..bf3f0dc 100644 --- a/src/main/java/com/niuan/erp/module/warehouse/service/WarehouseItemService.java +++ b/src/main/java/com/niuan/erp/module/warehouse/service/WarehouseItemService.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.niuan.erp.common.base.BasePageReqParams; import com.niuan.erp.common.base.BaseSelectDto; -import com.niuan.erp.common.base.BaseTree; import com.niuan.erp.module.warehouse.controller.dto.ProductVendorMapAddDto; import com.niuan.erp.module.warehouse.controller.dto.ProductVendorMapDto; import com.niuan.erp.module.warehouse.controller.dto.WarehouseItemDto; diff --git a/src/main/java/com/niuan/erp/module/warehouse/service/WarehouseReceiptService.java b/src/main/java/com/niuan/erp/module/warehouse/service/WarehouseReceiptService.java index 3077c1e..09888b2 100644 --- a/src/main/java/com/niuan/erp/module/warehouse/service/WarehouseReceiptService.java +++ b/src/main/java/com/niuan/erp/module/warehouse/service/WarehouseReceiptService.java @@ -7,7 +7,6 @@ import com.niuan.erp.module.common.entity.Document; import com.niuan.erp.module.warehouse.controller.dto.WarehouseReceiptAddDto; import com.niuan.erp.module.warehouse.controller.dto.WarehouseReceiptDto; import com.niuan.erp.module.warehouse.controller.dto.WarehouseReceiptItemDto; -import org.springframework.web.multipart.MultipartFile; import java.util.List; diff --git a/src/main/java/com/niuan/erp/module/warehouse/service/WarehouseService.java b/src/main/java/com/niuan/erp/module/warehouse/service/WarehouseService.java index e58796a..514cf59 100644 --- a/src/main/java/com/niuan/erp/module/warehouse/service/WarehouseService.java +++ b/src/main/java/com/niuan/erp/module/warehouse/service/WarehouseService.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.niuan.erp.common.base.BasePageReqParams; import com.niuan.erp.common.base.BaseSelectDto; -import com.niuan.erp.common.base.BaseTree; import com.niuan.erp.module.warehouse.controller.dto.WarehouseDto; import com.niuan.erp.module.warehouse.entity.Warehouse; diff --git a/src/main/java/com/niuan/erp/module/warehouse/service/impl/InventoryCountServiceImpl.java b/src/main/java/com/niuan/erp/module/warehouse/service/impl/InventoryCountServiceImpl.java index 18c0617..4cca5e6 100644 --- a/src/main/java/com/niuan/erp/module/warehouse/service/impl/InventoryCountServiceImpl.java +++ b/src/main/java/com/niuan/erp/module/warehouse/service/impl/InventoryCountServiceImpl.java @@ -14,7 +14,6 @@ import com.niuan.erp.module.common.enums.FormStatus; import com.niuan.erp.module.common.mapper.DocumentMapper; import com.niuan.erp.module.warehouse.controller.dto.InventoryCountAddDto; import com.niuan.erp.module.warehouse.controller.dto.InventoryCountDto; -import com.niuan.erp.module.warehouse.controller.dto.InventoryCountItemAddDto; import com.niuan.erp.module.warehouse.controller.dto.InventoryCountItemDto; import com.niuan.erp.module.warehouse.converter.InventoryCountConverter; import com.niuan.erp.module.warehouse.entity.InventoryCountItem; diff --git a/src/main/java/com/niuan/erp/module/warehouse/service/impl/StockServiceImpl.java b/src/main/java/com/niuan/erp/module/warehouse/service/impl/StockServiceImpl.java index 2655b17..5aba5ea 100644 --- a/src/main/java/com/niuan/erp/module/warehouse/service/impl/StockServiceImpl.java +++ b/src/main/java/com/niuan/erp/module/warehouse/service/impl/StockServiceImpl.java @@ -1,6 +1,5 @@ package com.niuan.erp.module.warehouse.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -15,9 +14,6 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.time.LocalDateTime; -import java.util.List; - @Service @Transactional diff --git a/src/main/java/com/niuan/erp/module/warehouse/service/impl/StockTransferOrderServiceImpl.java b/src/main/java/com/niuan/erp/module/warehouse/service/impl/StockTransferOrderServiceImpl.java index 49a3e32..fcf3a8a 100644 --- a/src/main/java/com/niuan/erp/module/warehouse/service/impl/StockTransferOrderServiceImpl.java +++ b/src/main/java/com/niuan/erp/module/warehouse/service/impl/StockTransferOrderServiceImpl.java @@ -17,22 +17,20 @@ import com.niuan.erp.module.common.mapper.DocumentMaterialMapper; import com.niuan.erp.module.warehouse.controller.dto.*; import com.niuan.erp.module.warehouse.converter.StockTransferOrderConverter; import com.niuan.erp.module.warehouse.entity.Stock; -import com.niuan.erp.module.warehouse.entity.WarehouseItem; -import com.niuan.erp.module.warehouse.entity.Warehouse; -import com.niuan.erp.module.warehouse.mapper.WarehouseMapper; import com.niuan.erp.module.warehouse.mapper.StockMapper; import com.niuan.erp.module.warehouse.mapper.WarehouseItemMapper; +import com.niuan.erp.module.warehouse.mapper.WarehouseMapper; import com.niuan.erp.module.warehouse.service.StockTransferOrderService; import lombok.RequiredArgsConstructor; -import org.apache.poi.ss.usermodel.*; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; -import org.springframework.web.multipart.MultipartFile; -import java.io.IOException; import java.time.LocalDateTime; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; diff --git a/src/main/java/com/niuan/erp/module/warehouse/service/impl/WarehouseItemServiceImpl.java b/src/main/java/com/niuan/erp/module/warehouse/service/impl/WarehouseItemServiceImpl.java index 980366b..c676a99 100644 --- a/src/main/java/com/niuan/erp/module/warehouse/service/impl/WarehouseItemServiceImpl.java +++ b/src/main/java/com/niuan/erp/module/warehouse/service/impl/WarehouseItemServiceImpl.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.niuan.erp.common.base.BasePageReqParams; import com.niuan.erp.common.base.BaseSelectDto; -import com.niuan.erp.common.base.BaseTree; import com.niuan.erp.common.exception.BusinessException; import com.niuan.erp.common.utils.SecurityUtils; import com.niuan.erp.module.sys.entity.Vendor; @@ -25,11 +24,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; diff --git a/src/main/java/com/niuan/erp/module/warehouse/service/impl/WarehouseReceiptServiceImpl.java b/src/main/java/com/niuan/erp/module/warehouse/service/impl/WarehouseReceiptServiceImpl.java index 6c440b7..7243065 100644 --- a/src/main/java/com/niuan/erp/module/warehouse/service/impl/WarehouseReceiptServiceImpl.java +++ b/src/main/java/com/niuan/erp/module/warehouse/service/impl/WarehouseReceiptServiceImpl.java @@ -16,7 +16,6 @@ import com.niuan.erp.module.common.mapper.DocumentMapper; import com.niuan.erp.module.common.mapper.DocumentMaterialMapper; import com.niuan.erp.module.warehouse.controller.dto.WarehouseReceiptAddDto; import com.niuan.erp.module.warehouse.controller.dto.WarehouseReceiptDto; -import com.niuan.erp.module.warehouse.controller.dto.WarehouseReceiptItemAddDto; import com.niuan.erp.module.warehouse.controller.dto.WarehouseReceiptItemDto; import com.niuan.erp.module.warehouse.converter.WarehouseReceiptConverter; import com.niuan.erp.module.warehouse.entity.Stock; @@ -25,13 +24,9 @@ import com.niuan.erp.module.warehouse.mapper.StockMapper; import com.niuan.erp.module.warehouse.mapper.WarehouseItemMapper; import com.niuan.erp.module.warehouse.service.WarehouseReceiptService; import lombok.RequiredArgsConstructor; -import org.apache.poi.ss.usermodel.*; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.StringUtils; -import org.springframework.web.multipart.MultipartFile; -import java.io.IOException; import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors;