na/erp-backend
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

第一版错误修改前的存档。

Browse Source
This commit is contained in:
c
2026-03-16 14:16:30 +08:00
parent ddf933185f
commit e26d2f21df
43 changed files with 59 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/niuan/erp/module/auth/service/CustomUserDetailsService.java
View File

@@ -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;

2
src/main/java/com/niuan/erp/module/auth/service/impl/SystemAuthServiceImpl.java
View File

@@ -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;

2
src/main/java/com/niuan/erp/module/common/mapper/DocumentMaterialMapper.java
View File

@@ -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;
/**
* <p>

11
src/main/java/com/niuan/erp/module/production/controller/FinishedProductShipmentController.java
View File

@@ -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;

8
src/main/java/com/niuan/erp/module/production/controller/ProductionIssueController.java
View File

@@ -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;

3
src/main/java/com/niuan/erp/module/production/controller/ProductionReturnController.java
View File

@@ -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;

1
src/main/java/com/niuan/erp/module/production/controller/dto/FinishedProductShipmentDto.java
View File

@@ -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")

1
src/main/java/com/niuan/erp/module/production/entity/ProduceOrderList.java
View File

@@ -1,6 +1,7 @@
package com.niuan.erp.module.production.entity;
import lombok.Data;
import java.io.Serializable;
@Data

1
src/main/java/com/niuan/erp/module/production/enums/ProductionPlanStatus.java
View File

@@ -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<Integer> {
NoComplete(0, "未完成"),

2
src/main/java/com/niuan/erp/module/production/mapper/ProductionPlanMapper.java
View File

@@ -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;
/**
* <p>

1
src/main/java/com/niuan/erp/module/production/service/FinishedProductReceiptService.java
View File

@@ -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;

1
src/main/java/com/niuan/erp/module/production/service/FinishedProductShipmentService.java
View File

@@ -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;

1
src/main/java/com/niuan/erp/module/production/service/ProductionIssueService.java
View File

@@ -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;

1
src/main/java/com/niuan/erp/module/production/service/ProductionPlanService.java
View File

@@ -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;

5
src/main/java/com/niuan/erp/module/production/service/impl/BomServiceImpl.java
View File

@@ -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;

6
src/main/java/com/niuan/erp/module/production/service/impl/FinishedProductReceiptServiceImpl.java
View File

@@ -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;

7
src/main/java/com/niuan/erp/module/production/service/impl/FinishedProductShipmentServiceImpl.java
View File

@@ -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;

7
src/main/java/com/niuan/erp/module/production/service/impl/ProductionPlanServiceImpl.java
View File

@@ -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;

1
src/main/java/com/niuan/erp/module/purchase/controller/dto/PurchaseOrderDto.java
View File

@@ -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;

2
src/main/java/com/niuan/erp/module/purchase/controller/dto/PurchasePlanItemAddDto.java
View File

@@ -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,

1
src/main/java/com/niuan/erp/module/purchase/enums/PurchasePlanStatus.java
View File

@@ -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<Integer> {
UNSTART(0, "未开始"),

6
src/main/java/com/niuan/erp/module/purchase/service/PurchaseOrderService.java
View File

@@ -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;

6
src/main/java/com/niuan/erp/module/purchase/service/PurchasePlanService.java
View File

@@ -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;

8
src/main/java/com/niuan/erp/module/purchase/service/impl/PurchaseOrderServiceImpl.java
View File

@@ -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;

11
src/main/java/com/niuan/erp/module/purchase/service/impl/PurchasePlanServiceImpl.java
View File

@@ -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;

6
src/main/java/com/niuan/erp/module/sale/controller/DeviceController.java
View File

@@ -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溯源管理")

5
src/main/java/com/niuan/erp/module/sale/controller/RepairRecordController.java
View File

@@ -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("返修报表管理")

7
src/main/java/com/niuan/erp/module/sale/service/impl/SaleOrderServiceImpl.java
View File

@@ -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;

6
src/main/java/com/niuan/erp/module/sys/service/impl/SysRoleServiceImpl.java
View File

@@ -60,7 +60,8 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
return rp;
})
.toList();
rolePermissionMapper.insert(rolePermissions);
// 使用 saveBatch 批量插入，避免无主键实体使用 insert 方法的问题
rolePermissions.forEach(rolePermissionMapper::insert);
}
}
@@ -83,7 +84,8 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
return rp;
})
.toList();
rolePermissionMapper.insert(newPermissions);
// 使用循环单条插入，避免无主键实体使用批量 insert 方法的问题
newPermissions.forEach(rolePermissionMapper::insert);
}
}

7
src/main/java/com/niuan/erp/module/warehouse/controller/InventoryCountController.java
View File

@@ -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")

7
src/main/java/com/niuan/erp/module/warehouse/controller/StockController.java
View File

@@ -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

1
src/main/java/com/niuan/erp/module/warehouse/converter/InventoryCountConverter.java
View File

@@ -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;

1
src/main/java/com/niuan/erp/module/warehouse/converter/StockTransferOrderConverter.java
View File

@@ -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;

4
src/main/java/com/niuan/erp/module/warehouse/mapper/StockMapper.java
View File

@@ -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;
/**
* <p>

4
src/main/java/com/niuan/erp/module/warehouse/service/StockService.java
View File

@@ -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 {

1
src/main/java/com/niuan/erp/module/warehouse/service/WarehouseItemService.java
View File

@@ -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;

1
src/main/java/com/niuan/erp/module/warehouse/service/WarehouseReceiptService.java
View File

@@ -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;

1
src/main/java/com/niuan/erp/module/warehouse/service/WarehouseService.java
View File

@@ -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;

1
src/main/java/com/niuan/erp/module/warehouse/service/impl/InventoryCountServiceImpl.java
View File

@@ -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;

4
src/main/java/com/niuan/erp/module/warehouse/service/impl/StockServiceImpl.java
View File

@@ -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

12
src/main/java/com/niuan/erp/module/warehouse/service/impl/StockTransferOrderServiceImpl.java
View File

@@ -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;

7
src/main/java/com/niuan/erp/module/warehouse/service/impl/WarehouseItemServiceImpl.java
View File

@@ -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;

5
src/main/java/com/niuan/erp/module/warehouse/service/impl/WarehouseReceiptServiceImpl.java
View File

@@ -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;