diff --git a/src/main/java/com/nov/KgLowDurable/controller/DepartmentController.java b/src/main/java/com/nov/KgLowDurable/controller/DepartmentController.java index 6a6b635..cdcdd73 100644 --- a/src/main/java/com/nov/KgLowDurable/controller/DepartmentController.java +++ b/src/main/java/com/nov/KgLowDurable/controller/DepartmentController.java @@ -2,17 +2,13 @@ package com.nov.KgLowDurable.controller; import com.nov.KgLowDurable.pojo.vo.DepartmentVO; import com.nov.KgLowDurable.service.IDepartmentService; import com.nov.KgLowDurable.util.Result; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperationSort; import lombok.AllArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; - import java.util.List; diff --git a/src/main/java/com/nov/KgLowDurable/controller/LdConsumerFormController.java b/src/main/java/com/nov/KgLowDurable/controller/LdConsumerFormController.java index 1c2ae9e..39d38f5 100644 --- a/src/main/java/com/nov/KgLowDurable/controller/LdConsumerFormController.java +++ b/src/main/java/com/nov/KgLowDurable/controller/LdConsumerFormController.java @@ -1,10 +1,6 @@ package com.nov.KgLowDurable.controller; import com.nov.KgLowDurable.pojo.entity.LdConsumerForm; -import com.nov.KgLowDurable.pojo.entity.LdOneOutStorageDetail; -import com.nov.KgLowDurable.pojo.vo.DepartmentVO; -import com.nov.KgLowDurable.pojo.vo.QuarterVO; import com.nov.KgLowDurable.service.ILdConsumerFormService; -import com.nov.KgLowDurable.service.ILdDemandEndService; import com.nov.KgLowDurable.util.Result; import io.swagger.annotations.*; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/nov/KgLowDurable/controller/LdDemandEndController.java b/src/main/java/com/nov/KgLowDurable/controller/LdDemandEndController.java index 9938ca4..740879e 100644 --- a/src/main/java/com/nov/KgLowDurable/controller/LdDemandEndController.java +++ b/src/main/java/com/nov/KgLowDurable/controller/LdDemandEndController.java @@ -1,10 +1,8 @@ package com.nov.KgLowDurable.controller; import com.nov.KgLowDurable.pojo.entity.LdOneOutStorageDetail; -import com.nov.KgLowDurable.pojo.entity.LdOnePutStorageDetail; import com.nov.KgLowDurable.pojo.vo.DepartmentVO; import com.nov.KgLowDurable.pojo.vo.QuarterVO; import com.nov.KgLowDurable.service.ILdDemandEndService; -import com.nov.KgLowDurable.service.ILdPurchaseEndService; import com.nov.KgLowDurable.util.Result; import io.swagger.annotations.*; import lombok.AllArgsConstructor; @@ -12,7 +10,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; - import java.util.List; import java.util.Map; diff --git a/src/main/java/com/nov/KgLowDurable/controller/LdMaterialController.java b/src/main/java/com/nov/KgLowDurable/controller/LdMaterialController.java index 324a390..cee10e5 100644 --- a/src/main/java/com/nov/KgLowDurable/controller/LdMaterialController.java +++ b/src/main/java/com/nov/KgLowDurable/controller/LdMaterialController.java @@ -1,4 +1,3 @@ - package com.nov.KgLowDurable.controller; import com.nov.KgLowDurable.enums.MaterialCategoryEnum; import com.nov.KgLowDurable.pojo.entity.LdMaterial; diff --git a/src/main/java/com/nov/KgLowDurable/controller/LdOneOutStorageController.java b/src/main/java/com/nov/KgLowDurable/controller/LdOneOutStorageController.java index 1ce9739..0662e2f 100644 --- a/src/main/java/com/nov/KgLowDurable/controller/LdOneOutStorageController.java +++ b/src/main/java/com/nov/KgLowDurable/controller/LdOneOutStorageController.java @@ -1,16 +1,12 @@ package com.nov.KgLowDurable.controller; - import com.nov.KgLowDurable.pojo.dto.LdOneOutStorageDto; -import com.nov.KgLowDurable.pojo.dto.LdOnePutStorageDto; import com.nov.KgLowDurable.service.ILdOneOutStorageService; -import com.nov.KgLowDurable.service.ILdOnePutStorageService; import com.nov.KgLowDurable.util.Result; import io.swagger.annotations.*; import lombok.AllArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.*; - import java.util.Date; diff --git a/src/main/java/com/nov/KgLowDurable/controller/LdOneOutStorageDetailController.java b/src/main/java/com/nov/KgLowDurable/controller/LdOneOutStorageDetailController.java index f8654c2..cb24cac 100644 --- a/src/main/java/com/nov/KgLowDurable/controller/LdOneOutStorageDetailController.java +++ b/src/main/java/com/nov/KgLowDurable/controller/LdOneOutStorageDetailController.java @@ -1,11 +1,7 @@ package com.nov.KgLowDurable.controller; - import com.nov.KgLowDurable.enums.DepartmentEnum; import com.nov.KgLowDurable.pojo.entity.LdOneOutStorageDetail; -import com.nov.KgLowDurable.pojo.entity.LdOnePutStorageDetail; import com.nov.KgLowDurable.service.ILdOneOutStorageDetailService; -import com.nov.KgLowDurable.service.ILdOneOutStorageService; -import com.nov.KgLowDurable.service.ILdOnePutStorageDetailService; import com.nov.KgLowDurable.util.Result; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperationSort; diff --git a/src/main/java/com/nov/KgLowDurable/controller/LdOnePutStorageController.java b/src/main/java/com/nov/KgLowDurable/controller/LdOnePutStorageController.java index b93d64c..01feab9 100644 --- a/src/main/java/com/nov/KgLowDurable/controller/LdOnePutStorageController.java +++ b/src/main/java/com/nov/KgLowDurable/controller/LdOnePutStorageController.java @@ -1,15 +1,11 @@ package com.nov.KgLowDurable.controller; - import com.nov.KgLowDurable.pojo.dto.LdOnePutStorageDto; -import com.nov.KgLowDurable.pojo.entity.LdMaterial; -import com.nov.KgLowDurable.service.ILdOneFormService; import com.nov.KgLowDurable.service.ILdOnePutStorageService; import com.nov.KgLowDurable.util.Result; import io.swagger.annotations.*; import lombok.AllArgsConstructor; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.*; - import java.util.Date; diff --git a/src/main/java/com/nov/KgLowDurable/controller/LdPurchaseEndController.java b/src/main/java/com/nov/KgLowDurable/controller/LdPurchaseEndController.java index 6f2ca31..2219511 100644 --- a/src/main/java/com/nov/KgLowDurable/controller/LdPurchaseEndController.java +++ b/src/main/java/com/nov/KgLowDurable/controller/LdPurchaseEndController.java @@ -1,8 +1,6 @@ package com.nov.KgLowDurable.controller; import com.nov.KgLowDurable.pojo.entity.LdOnePutStorageDetail; -import com.nov.KgLowDurable.pojo.entity.LdPurchaseEnd; import com.nov.KgLowDurable.pojo.vo.QuarterVO; -import com.nov.KgLowDurable.service.ILdOneFormService; import com.nov.KgLowDurable.service.ILdPurchaseEndService; import com.nov.KgLowDurable.util.Result; import io.swagger.annotations.*; @@ -11,7 +9,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; - import java.util.List; diff --git a/src/main/java/com/nov/KgLowDurable/controller/LdTwoInventoryRecordController.java b/src/main/java/com/nov/KgLowDurable/controller/LdTwoInventoryRecordController.java new file mode 100644 index 0000000..9b1497f --- /dev/null +++ b/src/main/java/com/nov/KgLowDurable/controller/LdTwoInventoryRecordController.java @@ -0,0 +1,50 @@ +package com.nov.KgLowDurable.controller; +import com.nov.KgLowDurable.pojo.dto.ApproveDto; +import com.nov.KgLowDurable.service.ILdTwoInventoryRecordService; +import com.nov.KgLowDurable.util.Result; +import io.swagger.annotations.*; +import lombok.AllArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** + * @author liweidong + */ +@RestController +@AllArgsConstructor +@RequestMapping("/twoInventoryRecord") +public class LdTwoInventoryRecordController { + + @Autowired + ILdTwoInventoryRecordService twoInventoryRecordService; + + + @GetMapping("/list") + @ApiOperationSort(1) + @ApiOperation(value = "获取二级出入库记录", notes = "出入库记录列表", httpMethod = "GET", response = Result.class) + @ApiImplicitParams({ + @ApiImplicitParam(name = "consumerFormId", value = "易耗品库存ID", dataType = "Long", paramType = "query") + }) + public Result list(@ApiParam(hidden = true) + @RequestParam(required = false) Long consumerFormId, + @RequestParam(required = false) String transactionType, + @RequestParam(required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(required = false ,defaultValue = "10") Integer pageSize) { + + return Result.OK(twoInventoryRecordService.getTwoInventoryRecordList(consumerFormId,transactionType,pageNum,pageSize)); + } + + + @PostMapping("/approve") + @ApiOperationSort(2) + @ApiOperation(value = "审批通过", notes = "二级出库回调接口", httpMethod = "POST", response = Result.class) + public Result approve(@RequestBody ApproveDto approveDto) { + Long twoOutStorageId = approveDto.getTwoOutStorageId(); + boolean approveResult = approveDto.getApproveResult(); + return Result.OK(twoInventoryRecordService.approve(twoOutStorageId,approveResult)); + } + + + +} diff --git a/src/main/java/com/nov/KgLowDurable/controller/LdTwoOutStorageController.java b/src/main/java/com/nov/KgLowDurable/controller/LdTwoOutStorageController.java index 3d3e79a..949b2af 100644 --- a/src/main/java/com/nov/KgLowDurable/controller/LdTwoOutStorageController.java +++ b/src/main/java/com/nov/KgLowDurable/controller/LdTwoOutStorageController.java @@ -1,6 +1,5 @@ package com.nov.KgLowDurable.controller; import com.nov.KgLowDurable.pojo.dto.LdTwoOutStorageDto; -import com.nov.KgLowDurable.pojo.dto.LdTwoPutStorageDto; import com.nov.KgLowDurable.service.ILdTwoOutStorageService; import com.nov.KgLowDurable.util.Result; import io.swagger.annotations.*; @@ -8,7 +7,6 @@ import lombok.AllArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.*; - import java.util.Date; diff --git a/src/main/java/com/nov/KgLowDurable/controller/LdTwoOutStorageDetailController.java b/src/main/java/com/nov/KgLowDurable/controller/LdTwoOutStorageDetailController.java index 0406c92..d829883 100644 --- a/src/main/java/com/nov/KgLowDurable/controller/LdTwoOutStorageDetailController.java +++ b/src/main/java/com/nov/KgLowDurable/controller/LdTwoOutStorageDetailController.java @@ -1,17 +1,8 @@ package com.nov.KgLowDurable.controller; -import com.nov.KgLowDurable.pojo.vo.DepartmentVO; -import com.nov.KgLowDurable.service.IDepartmentService; -import com.nov.KgLowDurable.util.Result; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiOperationSort; import lombok.AllArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - /** * @author liweidong diff --git a/src/main/java/com/nov/KgLowDurable/controller/LdTwoPutStorageController.java b/src/main/java/com/nov/KgLowDurable/controller/LdTwoPutStorageController.java index b8f91de..d48de13 100644 --- a/src/main/java/com/nov/KgLowDurable/controller/LdTwoPutStorageController.java +++ b/src/main/java/com/nov/KgLowDurable/controller/LdTwoPutStorageController.java @@ -6,7 +6,6 @@ import io.swagger.annotations.*; import lombok.AllArgsConstructor; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.*; - import java.util.Date; diff --git a/src/main/java/com/nov/KgLowDurable/controller/LdTwoPutStorageDetailController.java b/src/main/java/com/nov/KgLowDurable/controller/LdTwoPutStorageDetailController.java index 35c39ed..92fb644 100644 --- a/src/main/java/com/nov/KgLowDurable/controller/LdTwoPutStorageDetailController.java +++ b/src/main/java/com/nov/KgLowDurable/controller/LdTwoPutStorageDetailController.java @@ -1,14 +1,6 @@ package com.nov.KgLowDurable.controller; - -import com.nov.KgLowDurable.pojo.entity.LdOnePutStorageDetail; -import com.nov.KgLowDurable.service.ILdOnePutStorageDetailService; -import com.nov.KgLowDurable.util.Result; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiOperationSort; import lombok.AllArgsConstructor; -import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/nov/KgLowDurable/controller/MenuController.java b/src/main/java/com/nov/KgLowDurable/controller/MenuController.java index 6518c64..37ef67f 100644 --- a/src/main/java/com/nov/KgLowDurable/controller/MenuController.java +++ b/src/main/java/com/nov/KgLowDurable/controller/MenuController.java @@ -1,4 +1,3 @@ - package com.nov.KgLowDurable.controller; import com.nov.KgLowDurable.pojo.entity.Menu; import com.nov.KgLowDurable.service.IMenuService; diff --git a/src/main/java/com/nov/KgLowDurable/controller/UserController.java b/src/main/java/com/nov/KgLowDurable/controller/UserController.java index 78bfab6..c6f8ca1 100644 --- a/src/main/java/com/nov/KgLowDurable/controller/UserController.java +++ b/src/main/java/com/nov/KgLowDurable/controller/UserController.java @@ -1,6 +1,4 @@ package com.nov.KgLowDurable.controller; -import com.nov.KgLowDurable.pojo.vo.DepartmentVO; -import com.nov.KgLowDurable.service.IDepartmentService; import com.nov.KgLowDurable.service.IUserService; import com.nov.KgLowDurable.util.Result; import io.swagger.annotations.ApiOperation; @@ -12,8 +10,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - /** * @author liweidong diff --git a/src/main/java/com/nov/KgLowDurable/enums/MaterialCategoryEnum.java b/src/main/java/com/nov/KgLowDurable/enums/MaterialCategoryEnum.java index fbf34c9..1337f9a 100644 --- a/src/main/java/com/nov/KgLowDurable/enums/MaterialCategoryEnum.java +++ b/src/main/java/com/nov/KgLowDurable/enums/MaterialCategoryEnum.java @@ -1,6 +1,5 @@ package com.nov.KgLowDurable.enums; import lombok.Getter; - import java.util.Arrays; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/com/nov/KgLowDurable/mapper/DepartmentMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/DepartmentMapper.java index 5043944..eec5231 100644 --- a/src/main/java/com/nov/KgLowDurable/mapper/DepartmentMapper.java +++ b/src/main/java/com/nov/KgLowDurable/mapper/DepartmentMapper.java @@ -1,10 +1,7 @@ package com.nov.KgLowDurable.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.nov.KgLowDurable.pojo.entity.Department; -import com.nov.KgLowDurable.pojo.entity.LdApprove; import com.nov.KgLowDurable.pojo.vo.DepartmentVO; -import org.apache.ibatis.annotations.Param; - import java.util.List; diff --git a/src/main/java/com/nov/KgLowDurable/mapper/LdApproveMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/LdApproveMapper.java index f865855..df8de6b 100644 --- a/src/main/java/com/nov/KgLowDurable/mapper/LdApproveMapper.java +++ b/src/main/java/com/nov/KgLowDurable/mapper/LdApproveMapper.java @@ -1,10 +1,7 @@ package com.nov.KgLowDurable.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.nov.KgLowDurable.pojo.entity.LdApprove; -import com.nov.KgLowDurable.pojo.entity.LdDemandEnd; -import com.nov.KgLowDurable.pojo.vo.QuarterVO; import org.apache.ibatis.annotations.Param; - import java.util.List; diff --git a/src/main/java/com/nov/KgLowDurable/mapper/LdConsumerFormMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/LdConsumerFormMapper.java index 5ff8800..e1dd280 100644 --- a/src/main/java/com/nov/KgLowDurable/mapper/LdConsumerFormMapper.java +++ b/src/main/java/com/nov/KgLowDurable/mapper/LdConsumerFormMapper.java @@ -1,9 +1,7 @@ package com.nov.KgLowDurable.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nov.KgLowDurable.pojo.entity.LdApprove; import com.nov.KgLowDurable.pojo.entity.LdConsumerForm; import org.apache.ibatis.annotations.Param; - import java.util.List; diff --git a/src/main/java/com/nov/KgLowDurable/mapper/LdDemandEndMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/LdDemandEndMapper.java index 97fb3c3..ae948c7 100644 --- a/src/main/java/com/nov/KgLowDurable/mapper/LdDemandEndMapper.java +++ b/src/main/java/com/nov/KgLowDurable/mapper/LdDemandEndMapper.java @@ -1,12 +1,9 @@ package com.nov.KgLowDurable.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.nov.KgLowDurable.pojo.entity.LdDemandEnd; -import com.nov.KgLowDurable.pojo.entity.LdPurchaseEnd; import com.nov.KgLowDurable.pojo.vo.QuarterVO; import org.apache.ibatis.annotations.Param; - import java.util.List; -import java.util.Map; /** diff --git a/src/main/java/com/nov/KgLowDurable/mapper/LdDurableFormMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/LdDurableFormMapper.java index f365221..e877a1f 100644 --- a/src/main/java/com/nov/KgLowDurable/mapper/LdDurableFormMapper.java +++ b/src/main/java/com/nov/KgLowDurable/mapper/LdDurableFormMapper.java @@ -1,9 +1,7 @@ package com.nov.KgLowDurable.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nov.KgLowDurable.pojo.entity.LdApprove; import com.nov.KgLowDurable.pojo.entity.LdDurableForm; import org.apache.ibatis.annotations.Param; - import java.util.List; diff --git a/src/main/java/com/nov/KgLowDurable/mapper/LdInventoryRecordMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/LdInventoryRecordMapper.java index 97f18ea..9f91886 100644 --- a/src/main/java/com/nov/KgLowDurable/mapper/LdInventoryRecordMapper.java +++ b/src/main/java/com/nov/KgLowDurable/mapper/LdInventoryRecordMapper.java @@ -1,11 +1,7 @@ package com.nov.KgLowDurable.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.nov.KgLowDurable.pojo.entity.LdInventoryRecord; -import com.nov.KgLowDurable.pojo.entity.LdMaterial; -import com.nov.KgLowDurable.pojo.vo.LdMaterialVO; import org.apache.ibatis.annotations.Param; - import java.util.List; diff --git a/src/main/java/com/nov/KgLowDurable/mapper/LdMaterialMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/LdMaterialMapper.java index 6bf776c..91fd439 100644 --- a/src/main/java/com/nov/KgLowDurable/mapper/LdMaterialMapper.java +++ b/src/main/java/com/nov/KgLowDurable/mapper/LdMaterialMapper.java @@ -1,10 +1,8 @@ package com.nov.KgLowDurable.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.nov.KgLowDurable.pojo.entity.LdMaterial; import com.nov.KgLowDurable.pojo.vo.LdMaterialVO; import org.apache.ibatis.annotations.Param; - import java.util.List; diff --git a/src/main/java/com/nov/KgLowDurable/mapper/LdOneFormMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/LdOneFormMapper.java index 1b6384e..bb3cc4b 100644 --- a/src/main/java/com/nov/KgLowDurable/mapper/LdOneFormMapper.java +++ b/src/main/java/com/nov/KgLowDurable/mapper/LdOneFormMapper.java @@ -1,9 +1,7 @@ package com.nov.KgLowDurable.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.nov.KgLowDurable.pojo.entity.LdOneForm; import org.apache.ibatis.annotations.Param; - import java.util.List; diff --git a/src/main/java/com/nov/KgLowDurable/mapper/LdOneOutStorageDemandEndMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/LdOneOutStorageDemandEndMapper.java index fe7bb06..d314f6d 100644 --- a/src/main/java/com/nov/KgLowDurable/mapper/LdOneOutStorageDemandEndMapper.java +++ b/src/main/java/com/nov/KgLowDurable/mapper/LdOneOutStorageDemandEndMapper.java @@ -1,10 +1,7 @@ package com.nov.KgLowDurable.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.nov.KgLowDurable.pojo.entity.LdOneOutStorageDemandEnd; -import com.nov.KgLowDurable.pojo.entity.LdOnePutStoragePurchaseEnd; import org.apache.ibatis.annotations.Param; - import java.util.List; diff --git a/src/main/java/com/nov/KgLowDurable/mapper/LdOneOutStorageDetailMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/LdOneOutStorageDetailMapper.java index 68cc599..7b74b0f 100644 --- a/src/main/java/com/nov/KgLowDurable/mapper/LdOneOutStorageDetailMapper.java +++ b/src/main/java/com/nov/KgLowDurable/mapper/LdOneOutStorageDetailMapper.java @@ -1,5 +1,4 @@ package com.nov.KgLowDurable.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.nov.KgLowDurable.pojo.entity.LdOneOutStorageDetail; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/nov/KgLowDurable/mapper/LdOneOutStorageMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/LdOneOutStorageMapper.java index 51f6b5a..01b8f96 100644 --- a/src/main/java/com/nov/KgLowDurable/mapper/LdOneOutStorageMapper.java +++ b/src/main/java/com/nov/KgLowDurable/mapper/LdOneOutStorageMapper.java @@ -1,10 +1,7 @@ package com.nov.KgLowDurable.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.nov.KgLowDurable.pojo.entity.LdOneOutStorage; -import com.nov.KgLowDurable.pojo.entity.LdOnePutStorage; import org.apache.ibatis.annotations.Param; - import java.util.Date; import java.util.List; diff --git a/src/main/java/com/nov/KgLowDurable/mapper/LdOnePutStorageDetailMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/LdOnePutStorageDetailMapper.java index 6e51d21..9c31feb 100644 --- a/src/main/java/com/nov/KgLowDurable/mapper/LdOnePutStorageDetailMapper.java +++ b/src/main/java/com/nov/KgLowDurable/mapper/LdOnePutStorageDetailMapper.java @@ -1,11 +1,7 @@ package com.nov.KgLowDurable.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nov.KgLowDurable.pojo.entity.LdOnePutStorage; import com.nov.KgLowDurable.pojo.entity.LdOnePutStorageDetail; import org.apache.ibatis.annotations.Param; - -import java.util.Date; import java.util.List; /** diff --git a/src/main/java/com/nov/KgLowDurable/mapper/LdOnePutStorageMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/LdOnePutStorageMapper.java index f95fda8..d0e882c 100644 --- a/src/main/java/com/nov/KgLowDurable/mapper/LdOnePutStorageMapper.java +++ b/src/main/java/com/nov/KgLowDurable/mapper/LdOnePutStorageMapper.java @@ -1,10 +1,7 @@ package com.nov.KgLowDurable.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nov.KgLowDurable.pojo.entity.LdOneForm; import com.nov.KgLowDurable.pojo.entity.LdOnePutStorage; import org.apache.ibatis.annotations.Param; - import java.util.Date; import java.util.List; diff --git a/src/main/java/com/nov/KgLowDurable/mapper/LdOnePutStoragePurchaseEndMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/LdOnePutStoragePurchaseEndMapper.java index 1b681d9..4bda233 100644 --- a/src/main/java/com/nov/KgLowDurable/mapper/LdOnePutStoragePurchaseEndMapper.java +++ b/src/main/java/com/nov/KgLowDurable/mapper/LdOnePutStoragePurchaseEndMapper.java @@ -1,11 +1,7 @@ package com.nov.KgLowDurable.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nov.KgLowDurable.pojo.entity.LdMaterial; import com.nov.KgLowDurable.pojo.entity.LdOnePutStoragePurchaseEnd; -import com.nov.KgLowDurable.pojo.vo.LdMaterialVO; import org.apache.ibatis.annotations.Param; - import java.util.List; diff --git a/src/main/java/com/nov/KgLowDurable/mapper/LdPurchaseEndMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/LdPurchaseEndMapper.java index 1c4c094..c97eeb4 100644 --- a/src/main/java/com/nov/KgLowDurable/mapper/LdPurchaseEndMapper.java +++ b/src/main/java/com/nov/KgLowDurable/mapper/LdPurchaseEndMapper.java @@ -3,7 +3,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.nov.KgLowDurable.pojo.entity.LdPurchaseEnd; import com.nov.KgLowDurable.pojo.vo.QuarterVO; import org.apache.ibatis.annotations.Param; - import java.util.List; diff --git a/src/main/java/com/nov/KgLowDurable/mapper/LdTwoInventoryRecordMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/LdTwoInventoryRecordMapper.java new file mode 100644 index 0000000..fa25b7f --- /dev/null +++ b/src/main/java/com/nov/KgLowDurable/mapper/LdTwoInventoryRecordMapper.java @@ -0,0 +1,16 @@ +package com.nov.KgLowDurable.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nov.KgLowDurable.pojo.entity.LdTwoInventoryRecord; +import org.apache.ibatis.annotations.Param; +import java.util.List; + + +/** + * 物料接口 + * @author liweidong + */ +public interface LdTwoInventoryRecordMapper extends BaseMapper { + + + List selectByConsumerFormId(@Param("consumerFormId") Long consumerFormId,@Param("transactionType") String transactionType); +} diff --git a/src/main/java/com/nov/KgLowDurable/mapper/LdTwoOutStorageDetailMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/LdTwoOutStorageDetailMapper.java index 9207c87..37ef467 100644 --- a/src/main/java/com/nov/KgLowDurable/mapper/LdTwoOutStorageDetailMapper.java +++ b/src/main/java/com/nov/KgLowDurable/mapper/LdTwoOutStorageDetailMapper.java @@ -2,7 +2,6 @@ package com.nov.KgLowDurable.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.nov.KgLowDurable.pojo.entity.LdTwoOutStorageDetail; import org.apache.ibatis.annotations.Param; - import java.util.List; diff --git a/src/main/java/com/nov/KgLowDurable/mapper/LdTwoOutStorageMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/LdTwoOutStorageMapper.java index 5607306..29a6061 100644 --- a/src/main/java/com/nov/KgLowDurable/mapper/LdTwoOutStorageMapper.java +++ b/src/main/java/com/nov/KgLowDurable/mapper/LdTwoOutStorageMapper.java @@ -2,7 +2,6 @@ package com.nov.KgLowDurable.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.nov.KgLowDurable.pojo.entity.LdTwoOutStorage; import org.apache.ibatis.annotations.Param; - import java.util.Date; import java.util.List; diff --git a/src/main/java/com/nov/KgLowDurable/mapper/LdTwoPutStorageDetailMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/LdTwoPutStorageDetailMapper.java index f137023..e03ceb8 100644 --- a/src/main/java/com/nov/KgLowDurable/mapper/LdTwoPutStorageDetailMapper.java +++ b/src/main/java/com/nov/KgLowDurable/mapper/LdTwoPutStorageDetailMapper.java @@ -1,10 +1,7 @@ package com.nov.KgLowDurable.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nov.KgLowDurable.pojo.entity.LdOnePutStorageDetail; import com.nov.KgLowDurable.pojo.entity.LdTwoPutStorageDetail; import org.apache.ibatis.annotations.Param; - import java.util.List; /** diff --git a/src/main/java/com/nov/KgLowDurable/mapper/LdTwoPutStorageMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/LdTwoPutStorageMapper.java index b125077..d357a3d 100644 --- a/src/main/java/com/nov/KgLowDurable/mapper/LdTwoPutStorageMapper.java +++ b/src/main/java/com/nov/KgLowDurable/mapper/LdTwoPutStorageMapper.java @@ -1,11 +1,8 @@ package com.nov.KgLowDurable.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nov.KgLowDurable.pojo.entity.LdOnePutStorage; import com.nov.KgLowDurable.pojo.entity.LdTwoPutStorage; import com.nov.KgLowDurable.pojo.vo.LdTwoPutStorageVO; import org.apache.ibatis.annotations.Param; - import java.util.Date; import java.util.List; diff --git a/src/main/java/com/nov/KgLowDurable/mapper/MenuMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/MenuMapper.java index 0bb8527..7ffdfbd 100644 --- a/src/main/java/com/nov/KgLowDurable/mapper/MenuMapper.java +++ b/src/main/java/com/nov/KgLowDurable/mapper/MenuMapper.java @@ -1,5 +1,4 @@ package com.nov.KgLowDurable.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.nov.KgLowDurable.pojo.entity.Menu; diff --git a/src/main/java/com/nov/KgLowDurable/mapper/UserMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/UserMapper.java index 142140c..48e3eba 100644 --- a/src/main/java/com/nov/KgLowDurable/mapper/UserMapper.java +++ b/src/main/java/com/nov/KgLowDurable/mapper/UserMapper.java @@ -1,10 +1,7 @@ package com.nov.KgLowDurable.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nov.KgLowDurable.pojo.entity.Department; import com.nov.KgLowDurable.pojo.entity.User; -import com.nov.KgLowDurable.pojo.vo.DepartmentVO; import org.apache.ibatis.annotations.Param; - import java.util.List; diff --git a/src/main/java/com/nov/KgLowDurable/pojo/dto/ApproveDto.java b/src/main/java/com/nov/KgLowDurable/pojo/dto/ApproveDto.java index d320c18..15a1804 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/dto/ApproveDto.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/dto/ApproveDto.java @@ -1,5 +1,4 @@ package com.nov.KgLowDurable.pojo.dto; - import lombok.Data; import lombok.experimental.Accessors; @@ -15,6 +14,11 @@ public class ApproveDto { * 一级入库ID */ private Long onePutStorageId; + + /** + * 二级出库ID + */ + private Long twoOutStorageId; /** * 审批结果 */ diff --git a/src/main/java/com/nov/KgLowDurable/pojo/dto/LdOneOutStorageDto.java b/src/main/java/com/nov/KgLowDurable/pojo/dto/LdOneOutStorageDto.java index 3fc4980..a24b9b9 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/dto/LdOneOutStorageDto.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/dto/LdOneOutStorageDto.java @@ -1,14 +1,9 @@ package com.nov.KgLowDurable.pojo.dto; - import com.nov.KgLowDurable.pojo.entity.LdOneOutStorage; -import com.nov.KgLowDurable.pojo.entity.LdOneOutStorageDetail; -import com.nov.KgLowDurable.pojo.entity.LdOnePutStorage; import com.nov.KgLowDurable.pojo.vo.LdOneOutStorageDetailVO; -import com.nov.KgLowDurable.pojo.vo.LdOnePutStorageDetailVO; import com.nov.KgLowDurable.pojo.vo.UserInfoVO; import lombok.Data; import lombok.experimental.Accessors; - import java.io.Serializable; import java.util.List; diff --git a/src/main/java/com/nov/KgLowDurable/pojo/dto/LdOnePutStorageDto.java b/src/main/java/com/nov/KgLowDurable/pojo/dto/LdOnePutStorageDto.java index a41f2b9..e714e4d 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/dto/LdOnePutStorageDto.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/dto/LdOnePutStorageDto.java @@ -1,6 +1,5 @@ package com.nov.KgLowDurable.pojo.dto; import com.nov.KgLowDurable.pojo.entity.LdOnePutStorage; -import com.nov.KgLowDurable.pojo.entity.LdOnePutStorageDetail; import com.nov.KgLowDurable.pojo.vo.LdOnePutStorageDetailVO; import com.nov.KgLowDurable.pojo.vo.UserInfoVO; import lombok.Data; diff --git a/src/main/java/com/nov/KgLowDurable/pojo/dto/LdTwoOutStorageDto.java b/src/main/java/com/nov/KgLowDurable/pojo/dto/LdTwoOutStorageDto.java index cfa658f..4750749 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/dto/LdTwoOutStorageDto.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/dto/LdTwoOutStorageDto.java @@ -2,11 +2,9 @@ package com.nov.KgLowDurable.pojo.dto; import com.nov.KgLowDurable.pojo.entity.LdTwoOutStorage; import com.nov.KgLowDurable.pojo.entity.LdTwoOutStorageDetail; -import com.nov.KgLowDurable.pojo.entity.LdTwoPutStorage; import com.nov.KgLowDurable.pojo.vo.UserInfoVO; import lombok.Data; import lombok.experimental.Accessors; - import java.io.Serializable; import java.util.List; diff --git a/src/main/java/com/nov/KgLowDurable/pojo/dto/MenuDTO.java b/src/main/java/com/nov/KgLowDurable/pojo/dto/MenuDTO.java index 2fb3daf..4c07a7b 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/dto/MenuDTO.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/dto/MenuDTO.java @@ -1,5 +1,4 @@ package com.nov.KgLowDurable.pojo.dto; - import lombok.Data; import java.io.Serializable; diff --git a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdApprove.java b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdApprove.java index 2cb10c9..a407f5a 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdApprove.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdApprove.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; - import java.io.Serializable; import java.time.LocalDateTime; diff --git a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdDurableForm.java b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdDurableForm.java index ea76c63..8df4889 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdDurableForm.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdDurableForm.java @@ -3,6 +3,7 @@ package com.nov.KgLowDurable.pojo.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -108,6 +109,7 @@ public class LdDurableForm implements Serializable { /** * 归还时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") private Date returnTime; diff --git a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdInventoryRecord.java b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdInventoryRecord.java index cecbfe6..73908e8 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdInventoryRecord.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdInventoryRecord.java @@ -1,11 +1,9 @@ package com.nov.KgLowDurable.pojo.entity; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.experimental.Accessors; - import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdMaterial.java b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdMaterial.java index e083656..01b5f5a 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdMaterial.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdMaterial.java @@ -4,7 +4,6 @@ package com.nov.KgLowDurable.pojo.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.nov.KgLowDurable.common.BaseEntity; import lombok.Data; import lombok.experimental.Accessors; diff --git a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdOneForm.java b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdOneForm.java index b3b66db..7877e15 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdOneForm.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdOneForm.java @@ -4,7 +4,6 @@ package com.nov.KgLowDurable.pojo.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.nov.KgLowDurable.common.BaseEntity; import lombok.Data; import lombok.experimental.Accessors; diff --git a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoPutStorage.java b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoPutStorage.java index 1a7e575..e811471 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoPutStorage.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoPutStorage.java @@ -7,8 +7,6 @@ import lombok.Data; import lombok.experimental.Accessors; import java.io.Serializable; -import java.time.LocalDate; -import java.time.LocalDateTime; import java.util.Date; /** diff --git a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoPutStorageDetail.java b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoPutStorageDetail.java index 7546761..70de065 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoPutStorageDetail.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/entity/LdTwoPutStorageDetail.java @@ -1,10 +1,4 @@ package com.nov.KgLowDurable.pojo.entity; - -/** - * @author: liweidong - * @create: 2025-12-23 - */ - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/src/main/java/com/nov/KgLowDurable/pojo/entity/User.java b/src/main/java/com/nov/KgLowDurable/pojo/entity/User.java index 8cbeacb..e76f9f0 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/entity/User.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/entity/User.java @@ -1,17 +1,10 @@ package com.nov.KgLowDurable.pojo.entity; - -/** - * @author: liweidong - * @create: 2025-12-26 - */ - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; - import java.io.Serializable; import java.util.Date; diff --git a/src/main/java/com/nov/KgLowDurable/pojo/vo/LdMaterialVO.java b/src/main/java/com/nov/KgLowDurable/pojo/vo/LdMaterialVO.java index f783faa..47a0135 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/vo/LdMaterialVO.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/vo/LdMaterialVO.java @@ -1,9 +1,5 @@ package com.nov.KgLowDurable.pojo.vo; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.nov.KgLowDurable.common.BaseEntity; import lombok.Data; import lombok.experimental.Accessors; diff --git a/src/main/java/com/nov/KgLowDurable/pojo/vo/LdOneOutStorageDetailVO.java b/src/main/java/com/nov/KgLowDurable/pojo/vo/LdOneOutStorageDetailVO.java index a5e8296..dd42c25 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/vo/LdOneOutStorageDetailVO.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/vo/LdOneOutStorageDetailVO.java @@ -1,7 +1,6 @@ package com.nov.KgLowDurable.pojo.vo; import com.nov.KgLowDurable.pojo.entity.LdOneOutStorageDetail; -import com.nov.KgLowDurable.pojo.entity.LdOnePutStorageDetail; import lombok.Data; import lombok.experimental.Accessors; @@ -21,6 +20,8 @@ public class LdOneOutStorageDetailVO extends LdOneOutStorageDetail implements Se /** * 本次出库数量 */ - private BigDecimal outboundQuantity; + private BigDecimal theOutboundQuantity; + + } diff --git a/src/main/java/com/nov/KgLowDurable/pojo/vo/LdOneOutStorageInfoVO.java b/src/main/java/com/nov/KgLowDurable/pojo/vo/LdOneOutStorageInfoVO.java index b8932dd..4e379ab 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/vo/LdOneOutStorageInfoVO.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/vo/LdOneOutStorageInfoVO.java @@ -2,8 +2,6 @@ package com.nov.KgLowDurable.pojo.vo; import com.nov.KgLowDurable.pojo.entity.LdOneOutStorage; import com.nov.KgLowDurable.pojo.entity.LdOneOutStorageDetail; -import com.nov.KgLowDurable.pojo.entity.LdOnePutStorage; -import com.nov.KgLowDurable.pojo.entity.LdOnePutStorageDetail; import lombok.Data; import lombok.experimental.Accessors; diff --git a/src/main/java/com/nov/KgLowDurable/pojo/vo/LdTwoPutStorageVO.java b/src/main/java/com/nov/KgLowDurable/pojo/vo/LdTwoPutStorageVO.java index 94245b0..a88d052 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/vo/LdTwoPutStorageVO.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/vo/LdTwoPutStorageVO.java @@ -1,14 +1,9 @@ package com.nov.KgLowDurable.pojo.vo; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import com.nov.KgLowDurable.pojo.entity.LdTwoPutStorage; import lombok.Data; -import lombok.experimental.Accessors; import java.io.Serializable; -import java.util.Date; /** * @author: liweidong diff --git a/src/main/java/com/nov/KgLowDurable/pojo/vo/MenuVO.java b/src/main/java/com/nov/KgLowDurable/pojo/vo/MenuVO.java index ffbc721..522fe52 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/vo/MenuVO.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/vo/MenuVO.java @@ -1,13 +1,8 @@ package com.nov.KgLowDurable.pojo.vo; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.nov.KgLowDurable.pojo.entity.Menu; import lombok.Data; -import lombok.EqualsAndHashCode; -import java.util.ArrayList; + import java.util.List; /** diff --git a/src/main/java/com/nov/KgLowDurable/pojo/vo/QuarterVO.java b/src/main/java/com/nov/KgLowDurable/pojo/vo/QuarterVO.java index da9888b..3f94774 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/vo/QuarterVO.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/vo/QuarterVO.java @@ -2,8 +2,6 @@ package com.nov.KgLowDurable.pojo.vo; import lombok.Data; -import java.util.List; - /** * @author: liweidong * @create: 2025-12-16 diff --git a/src/main/java/com/nov/KgLowDurable/pojo/vo/UserInfoVO.java b/src/main/java/com/nov/KgLowDurable/pojo/vo/UserInfoVO.java index c2455e1..7d33094 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/vo/UserInfoVO.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/vo/UserInfoVO.java @@ -3,8 +3,6 @@ package com.nov.KgLowDurable.pojo.vo; import lombok.Data; -import java.util.List; - /** * 视图实体类 * diff --git a/src/main/java/com/nov/KgLowDurable/service/IDepartmentService.java b/src/main/java/com/nov/KgLowDurable/service/IDepartmentService.java index 5bcb9b1..db73070 100644 --- a/src/main/java/com/nov/KgLowDurable/service/IDepartmentService.java +++ b/src/main/java/com/nov/KgLowDurable/service/IDepartmentService.java @@ -1,9 +1,7 @@ package com.nov.KgLowDurable.service; import com.baomidou.mybatisplus.extension.service.IService; import com.nov.KgLowDurable.pojo.entity.Department; -import com.nov.KgLowDurable.pojo.entity.LdConsumerForm; import com.nov.KgLowDurable.pojo.vo.DepartmentVO; - import java.util.List; diff --git a/src/main/java/com/nov/KgLowDurable/service/ILdApproveService.java b/src/main/java/com/nov/KgLowDurable/service/ILdApproveService.java index 8d66b8b..5265b07 100644 --- a/src/main/java/com/nov/KgLowDurable/service/ILdApproveService.java +++ b/src/main/java/com/nov/KgLowDurable/service/ILdApproveService.java @@ -1,11 +1,6 @@ package com.nov.KgLowDurable.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.github.pagehelper.PageInfo; import com.nov.KgLowDurable.pojo.entity.LdApprove; -import com.nov.KgLowDurable.pojo.entity.LdDemandEnd; -import com.nov.KgLowDurable.pojo.entity.LdOneOutStorageDetail; -import com.nov.KgLowDurable.pojo.vo.QuarterVO; - import java.util.List; diff --git a/src/main/java/com/nov/KgLowDurable/service/ILdConsumerFormService.java b/src/main/java/com/nov/KgLowDurable/service/ILdConsumerFormService.java index 23caf30..7b5e368 100644 --- a/src/main/java/com/nov/KgLowDurable/service/ILdConsumerFormService.java +++ b/src/main/java/com/nov/KgLowDurable/service/ILdConsumerFormService.java @@ -1,9 +1,8 @@ package com.nov.KgLowDurable.service; + import com.baomidou.mybatisplus.extension.service.IService; import com.github.pagehelper.PageInfo; -import com.nov.KgLowDurable.pojo.entity.LdApprove; import com.nov.KgLowDurable.pojo.entity.LdConsumerForm; - import java.util.List; diff --git a/src/main/java/com/nov/KgLowDurable/service/ILdDemandEndService.java b/src/main/java/com/nov/KgLowDurable/service/ILdDemandEndService.java index 903db88..3702a54 100644 --- a/src/main/java/com/nov/KgLowDurable/service/ILdDemandEndService.java +++ b/src/main/java/com/nov/KgLowDurable/service/ILdDemandEndService.java @@ -3,11 +3,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.github.pagehelper.PageInfo; import com.nov.KgLowDurable.pojo.entity.LdDemandEnd; import com.nov.KgLowDurable.pojo.entity.LdOneOutStorageDetail; -import com.nov.KgLowDurable.pojo.entity.LdOnePutStorageDetail; -import com.nov.KgLowDurable.pojo.entity.LdPurchaseEnd; import com.nov.KgLowDurable.pojo.vo.DepartmentVO; import com.nov.KgLowDurable.pojo.vo.QuarterVO; - import java.util.List; import java.util.Map; diff --git a/src/main/java/com/nov/KgLowDurable/service/ILdDurableFormService.java b/src/main/java/com/nov/KgLowDurable/service/ILdDurableFormService.java index 911e583..def2e20 100644 --- a/src/main/java/com/nov/KgLowDurable/service/ILdDurableFormService.java +++ b/src/main/java/com/nov/KgLowDurable/service/ILdDurableFormService.java @@ -1,7 +1,7 @@ package com.nov.KgLowDurable.service; + import com.baomidou.mybatisplus.extension.service.IService; import com.github.pagehelper.PageInfo; -import com.nov.KgLowDurable.pojo.entity.LdApprove; import com.nov.KgLowDurable.pojo.entity.LdDurableForm; diff --git a/src/main/java/com/nov/KgLowDurable/service/ILdInventoryRecordService.java b/src/main/java/com/nov/KgLowDurable/service/ILdInventoryRecordService.java index 3b0ad7d..62eb170 100644 --- a/src/main/java/com/nov/KgLowDurable/service/ILdInventoryRecordService.java +++ b/src/main/java/com/nov/KgLowDurable/service/ILdInventoryRecordService.java @@ -1,10 +1,9 @@ package com.nov.KgLowDurable.service; + import com.baomidou.mybatisplus.extension.service.IService; import com.github.pagehelper.PageInfo; import com.nov.KgLowDurable.pojo.entity.LdInventoryRecord; -import java.util.List; - /** * 出入库记录服务类 diff --git a/src/main/java/com/nov/KgLowDurable/service/ILdMaterialService.java b/src/main/java/com/nov/KgLowDurable/service/ILdMaterialService.java index e0d8574..abb59a8 100644 --- a/src/main/java/com/nov/KgLowDurable/service/ILdMaterialService.java +++ b/src/main/java/com/nov/KgLowDurable/service/ILdMaterialService.java @@ -1,7 +1,6 @@ package com.nov.KgLowDurable.service; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.github.pagehelper.PageInfo; import com.nov.KgLowDurable.pojo.entity.LdMaterial; diff --git a/src/main/java/com/nov/KgLowDurable/service/ILdOneFormService.java b/src/main/java/com/nov/KgLowDurable/service/ILdOneFormService.java index 9aeed3f..6632da2 100644 --- a/src/main/java/com/nov/KgLowDurable/service/ILdOneFormService.java +++ b/src/main/java/com/nov/KgLowDurable/service/ILdOneFormService.java @@ -1,11 +1,7 @@ - package com.nov.KgLowDurable.service; - - import com.baomidou.mybatisplus.extension.service.IService; import com.github.pagehelper.PageInfo; import com.nov.KgLowDurable.pojo.entity.LdOneForm; - import java.util.List; diff --git a/src/main/java/com/nov/KgLowDurable/service/ILdOneOutStorageDemandEndService.java b/src/main/java/com/nov/KgLowDurable/service/ILdOneOutStorageDemandEndService.java index 4e0ecdf..6211a04 100644 --- a/src/main/java/com/nov/KgLowDurable/service/ILdOneOutStorageDemandEndService.java +++ b/src/main/java/com/nov/KgLowDurable/service/ILdOneOutStorageDemandEndService.java @@ -1,8 +1,6 @@ package com.nov.KgLowDurable.service; import com.baomidou.mybatisplus.extension.service.IService; import com.nov.KgLowDurable.pojo.entity.LdOneOutStorageDemandEnd; -import com.nov.KgLowDurable.pojo.entity.LdOnePutStoragePurchaseEnd; - import java.util.List; diff --git a/src/main/java/com/nov/KgLowDurable/service/ILdOneOutStorageDetailService.java b/src/main/java/com/nov/KgLowDurable/service/ILdOneOutStorageDetailService.java index 5fd2ef7..8756cc1 100644 --- a/src/main/java/com/nov/KgLowDurable/service/ILdOneOutStorageDetailService.java +++ b/src/main/java/com/nov/KgLowDurable/service/ILdOneOutStorageDetailService.java @@ -1,11 +1,6 @@ - package com.nov.KgLowDurable.service; - - import com.baomidou.mybatisplus.extension.service.IService; import com.nov.KgLowDurable.pojo.entity.LdOneOutStorageDetail; -import com.nov.KgLowDurable.pojo.entity.LdOnePutStorageDetail; - import java.util.List; /** diff --git a/src/main/java/com/nov/KgLowDurable/service/ILdOneOutStorageService.java b/src/main/java/com/nov/KgLowDurable/service/ILdOneOutStorageService.java index 8885f25..ac2716e 100644 --- a/src/main/java/com/nov/KgLowDurable/service/ILdOneOutStorageService.java +++ b/src/main/java/com/nov/KgLowDurable/service/ILdOneOutStorageService.java @@ -1,20 +1,11 @@ - package com.nov.KgLowDurable.service; - - import com.baomidou.mybatisplus.extension.service.IService; import com.github.pagehelper.PageInfo; import com.nov.KgLowDurable.pojo.dto.LdOneOutStorageDto; -import com.nov.KgLowDurable.pojo.dto.LdOnePutStorageDto; import com.nov.KgLowDurable.pojo.entity.LdOneOutStorage; import com.nov.KgLowDurable.pojo.entity.LdOneOutStorageDetail; -import com.nov.KgLowDurable.pojo.entity.LdOnePutStorage; -import com.nov.KgLowDurable.pojo.entity.LdOnePutStorageDetail; import com.nov.KgLowDurable.pojo.vo.LdOneOutStorageInfoVO; -import com.nov.KgLowDurable.pojo.vo.LdOnePutStorageInfoVO; - import java.util.Date; -import java.util.List; /** * @author liweidong diff --git a/src/main/java/com/nov/KgLowDurable/service/ILdOnePutStorageDetailService.java b/src/main/java/com/nov/KgLowDurable/service/ILdOnePutStorageDetailService.java index 976a4e2..b29d0c3 100644 --- a/src/main/java/com/nov/KgLowDurable/service/ILdOnePutStorageDetailService.java +++ b/src/main/java/com/nov/KgLowDurable/service/ILdOnePutStorageDetailService.java @@ -1,10 +1,6 @@ - package com.nov.KgLowDurable.service; - - import com.baomidou.mybatisplus.extension.service.IService; import com.nov.KgLowDurable.pojo.entity.LdOnePutStorageDetail; - import java.util.List; /** diff --git a/src/main/java/com/nov/KgLowDurable/service/ILdOnePutStoragePurchaseEndService.java b/src/main/java/com/nov/KgLowDurable/service/ILdOnePutStoragePurchaseEndService.java index d98342b..2fc40c4 100644 --- a/src/main/java/com/nov/KgLowDurable/service/ILdOnePutStoragePurchaseEndService.java +++ b/src/main/java/com/nov/KgLowDurable/service/ILdOnePutStoragePurchaseEndService.java @@ -1,7 +1,6 @@ package com.nov.KgLowDurable.service; import com.baomidou.mybatisplus.extension.service.IService; import com.nov.KgLowDurable.pojo.entity.LdOnePutStoragePurchaseEnd; - import java.util.List; diff --git a/src/main/java/com/nov/KgLowDurable/service/ILdOnePutStorageService.java b/src/main/java/com/nov/KgLowDurable/service/ILdOnePutStorageService.java index d27098d..79c8c53 100644 --- a/src/main/java/com/nov/KgLowDurable/service/ILdOnePutStorageService.java +++ b/src/main/java/com/nov/KgLowDurable/service/ILdOnePutStorageService.java @@ -1,15 +1,10 @@ - package com.nov.KgLowDurable.service; - - import com.baomidou.mybatisplus.extension.service.IService; import com.github.pagehelper.PageInfo; import com.nov.KgLowDurable.pojo.dto.LdOnePutStorageDto; -import com.nov.KgLowDurable.pojo.entity.LdOneForm; import com.nov.KgLowDurable.pojo.entity.LdOnePutStorage; import com.nov.KgLowDurable.pojo.entity.LdOnePutStorageDetail; import com.nov.KgLowDurable.pojo.vo.LdOnePutStorageInfoVO; - import java.util.Date; import java.util.List; diff --git a/src/main/java/com/nov/KgLowDurable/service/ILdPurchaseEndService.java b/src/main/java/com/nov/KgLowDurable/service/ILdPurchaseEndService.java index ae99c24..ab4cbb5 100644 --- a/src/main/java/com/nov/KgLowDurable/service/ILdPurchaseEndService.java +++ b/src/main/java/com/nov/KgLowDurable/service/ILdPurchaseEndService.java @@ -1,13 +1,10 @@ package com.nov.KgLowDurable.service; import com.baomidou.mybatisplus.extension.service.IService; import com.github.pagehelper.PageInfo; -import com.nov.KgLowDurable.pojo.entity.LdOnePutStorage; import com.nov.KgLowDurable.pojo.entity.LdOnePutStorageDetail; import com.nov.KgLowDurable.pojo.entity.LdPurchaseEnd; import com.nov.KgLowDurable.pojo.vo.QuarterVO; - import java.util.List; -import java.util.Map; /** diff --git a/src/main/java/com/nov/KgLowDurable/service/ILdTwoInventoryRecordService.java b/src/main/java/com/nov/KgLowDurable/service/ILdTwoInventoryRecordService.java new file mode 100644 index 0000000..71bd8df --- /dev/null +++ b/src/main/java/com/nov/KgLowDurable/service/ILdTwoInventoryRecordService.java @@ -0,0 +1,31 @@ +package com.nov.KgLowDurable.service; +import com.baomidou.mybatisplus.extension.service.IService; +import com.github.pagehelper.PageInfo; +import com.nov.KgLowDurable.pojo.entity.LdTwoInventoryRecord; + + +/** + * 出入库记录服务类 + * + * @author liweidong + */ +public interface ILdTwoInventoryRecordService extends IService { + + /** + * 易耗品出入库记录 + * @param consumerFormId + * @param transactionType + * @param pageNum + * @param pageSize + * @return + */ + PageInfo getTwoInventoryRecordList(Long consumerFormId, String transactionType, Integer pageNum, Integer pageSize); + + /** + * 二级出库 审批回调接口 + * @param twoOutStorageId + * @param approveResult + * @return + */ + boolean approve(Long twoOutStorageId, boolean approveResult); +} diff --git a/src/main/java/com/nov/KgLowDurable/service/ILdTwoOutStorageDetailService.java b/src/main/java/com/nov/KgLowDurable/service/ILdTwoOutStorageDetailService.java index 145eaf7..12d0af7 100644 --- a/src/main/java/com/nov/KgLowDurable/service/ILdTwoOutStorageDetailService.java +++ b/src/main/java/com/nov/KgLowDurable/service/ILdTwoOutStorageDetailService.java @@ -1,7 +1,6 @@ package com.nov.KgLowDurable.service; import com.baomidou.mybatisplus.extension.service.IService; import com.nov.KgLowDurable.pojo.entity.LdTwoOutStorageDetail; - import java.util.List; diff --git a/src/main/java/com/nov/KgLowDurable/service/ILdTwoOutStorageService.java b/src/main/java/com/nov/KgLowDurable/service/ILdTwoOutStorageService.java index a08d4ab..cc779fc 100644 --- a/src/main/java/com/nov/KgLowDurable/service/ILdTwoOutStorageService.java +++ b/src/main/java/com/nov/KgLowDurable/service/ILdTwoOutStorageService.java @@ -4,7 +4,6 @@ import com.github.pagehelper.PageInfo; import com.nov.KgLowDurable.pojo.dto.LdTwoOutStorageDto; import com.nov.KgLowDurable.pojo.entity.LdTwoOutStorage; import com.nov.KgLowDurable.pojo.vo.LdTwoOutStorageInfoVO; - import java.util.Date; diff --git a/src/main/java/com/nov/KgLowDurable/service/ILdTwoPutStorageDetailService.java b/src/main/java/com/nov/KgLowDurable/service/ILdTwoPutStorageDetailService.java index c34ba0e..717ff82 100644 --- a/src/main/java/com/nov/KgLowDurable/service/ILdTwoPutStorageDetailService.java +++ b/src/main/java/com/nov/KgLowDurable/service/ILdTwoPutStorageDetailService.java @@ -1,9 +1,5 @@ - package com.nov.KgLowDurable.service; - - import com.baomidou.mybatisplus.extension.service.IService; -import com.nov.KgLowDurable.pojo.entity.LdOnePutStorageDetail; import com.nov.KgLowDurable.pojo.entity.LdTwoPutStorageDetail; import java.util.List; diff --git a/src/main/java/com/nov/KgLowDurable/service/ILdTwoPutStorageService.java b/src/main/java/com/nov/KgLowDurable/service/ILdTwoPutStorageService.java index e282c6e..a5b402a 100644 --- a/src/main/java/com/nov/KgLowDurable/service/ILdTwoPutStorageService.java +++ b/src/main/java/com/nov/KgLowDurable/service/ILdTwoPutStorageService.java @@ -1,20 +1,11 @@ - package com.nov.KgLowDurable.service; - - import com.baomidou.mybatisplus.extension.service.IService; import com.github.pagehelper.PageInfo; -import com.nov.KgLowDurable.pojo.dto.LdOnePutStorageDto; import com.nov.KgLowDurable.pojo.dto.LdTwoPutStorageDto; -import com.nov.KgLowDurable.pojo.entity.LdOnePutStorage; -import com.nov.KgLowDurable.pojo.entity.LdOnePutStorageDetail; import com.nov.KgLowDurable.pojo.entity.LdTwoPutStorage; -import com.nov.KgLowDurable.pojo.vo.LdOnePutStorageInfoVO; import com.nov.KgLowDurable.pojo.vo.LdTwoPutStorageInfoVO; import com.nov.KgLowDurable.pojo.vo.LdTwoPutStorageVO; - import java.util.Date; -import java.util.List; /** * @author liweidong diff --git a/src/main/java/com/nov/KgLowDurable/service/IUserService.java b/src/main/java/com/nov/KgLowDurable/service/IUserService.java index 58bdc00..b86ee12 100644 --- a/src/main/java/com/nov/KgLowDurable/service/IUserService.java +++ b/src/main/java/com/nov/KgLowDurable/service/IUserService.java @@ -1,10 +1,7 @@ package com.nov.KgLowDurable.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.nov.KgLowDurable.pojo.entity.Department; import com.nov.KgLowDurable.pojo.entity.User; -import com.nov.KgLowDurable.pojo.vo.DepartmentVO; import com.nov.KgLowDurable.pojo.vo.UserInfoVO; - import java.util.List; diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/DepartmentServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/DepartmentServiceImpl.java index ccac934..98c6664 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/DepartmentServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/DepartmentServiceImpl.java @@ -2,12 +2,9 @@ package com.nov.KgLowDurable.service.Impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nov.KgLowDurable.mapper.DepartmentMapper; -import com.nov.KgLowDurable.mapper.LdApproveMapper; import com.nov.KgLowDurable.pojo.entity.Department; -import com.nov.KgLowDurable.pojo.entity.LdApprove; import com.nov.KgLowDurable.pojo.vo.DepartmentVO; import com.nov.KgLowDurable.service.IDepartmentService; -import com.nov.KgLowDurable.service.ILdApproveService; import lombok.AllArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/LdApproveServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/LdApproveServiceImpl.java index 3fa7789..be7ea94 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/LdApproveServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdApproveServiceImpl.java @@ -1,31 +1,14 @@ package com.nov.KgLowDurable.service.Impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.nov.KgLowDurable.exception.CustomerException; import com.nov.KgLowDurable.mapper.LdApproveMapper; -import com.nov.KgLowDurable.mapper.LdDemandEndMapper; import com.nov.KgLowDurable.pojo.entity.LdApprove; -import com.nov.KgLowDurable.pojo.entity.LdDemandEnd; -import com.nov.KgLowDurable.pojo.entity.LdOneOutStorageDemandEnd; -import com.nov.KgLowDurable.pojo.entity.LdOneOutStorageDetail; -import com.nov.KgLowDurable.pojo.vo.QuarterVO; import com.nov.KgLowDurable.service.ILdApproveService; -import com.nov.KgLowDurable.service.ILdDemandEndService; -import com.nov.KgLowDurable.service.ILdOneOutStorageDemandEndService; -import com.nov.KgLowDurable.service.ILdOneOutStorageDetailService; -import com.nov.KgLowDurable.util.StringUtils; import lombok.AllArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; /** * 服务实现类 diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/LdOneOutStorageServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/LdOneOutStorageServiceImpl.java index 2ea459f..b9be264 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/LdOneOutStorageServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdOneOutStorageServiceImpl.java @@ -119,11 +119,11 @@ public class LdOneOutStorageServiceImpl extends ServiceImpl0){ + if (ldOneOutStorageDetail.getTheOutboundQuantity().compareTo(oneForm.getNum())>0){ throw new CustomerException(ldOneOutStorageDetail.getMaterialName()+"物资数量不足,请合理出库"); } // 计算数量 金额 - BigDecimal result = oneForm.getNum().subtract(ldOneOutStorageDetail.getOutboundQuantity()); + BigDecimal result = oneForm.getNum().subtract(ldOneOutStorageDetail.getTheOutboundQuantity()); BigDecimal product = result.multiply(oneForm.getUnitPrice()); oneForm.setNum(result); oneForm.setAmount(product); @@ -133,7 +133,7 @@ public class LdOneOutStorageServiceImpl extends ServiceImpl implements ILdTwoInventoryRecordService { + + @Autowired + LdTwoInventoryRecordMapper twoInventoryRecordMapper; + + @Override + public PageInfo getTwoInventoryRecordList(Long consumerFormId, String transactionType, Integer pageNum, Integer pageSize) { + + PageHelper.startPage(pageNum,pageSize); + // 查询全部 + List ldTwoInventoryRecordList = twoInventoryRecordMapper.selectByConsumerFormId(consumerFormId,transactionType); + // 返回结果 + PageInfo pageInfo = new PageInfo<>(ldTwoInventoryRecordList); + return pageInfo; + } + + @Override + public boolean approve(Long twoOutStorageId, boolean approveResult) { + return false; + } +} diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageDetailServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageDetailServiceImpl.java index f3bdea8..e2b0b76 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageDetailServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageDetailServiceImpl.java @@ -1,15 +1,11 @@ package com.nov.KgLowDurable.service.Impl; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nov.KgLowDurable.mapper.LdTwoOutStorageDetailMapper; import com.nov.KgLowDurable.pojo.entity.LdTwoOutStorageDetail; - - import com.nov.KgLowDurable.service.ILdTwoOutStorageDetailService; import lombok.AllArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - import java.util.List; /** diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageServiceImpl.java index 6a9e409..99fed58 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageServiceImpl.java @@ -1,5 +1,4 @@ package com.nov.KgLowDurable.service.Impl; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -22,7 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; - import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoPutStorageDetailServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoPutStorageDetailServiceImpl.java index a444373..a6e37e5 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoPutStorageDetailServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoPutStorageDetailServiceImpl.java @@ -11,7 +11,6 @@ import com.nov.KgLowDurable.service.ILdTwoPutStorageDetailService; import lombok.AllArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - import java.util.List; /** diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoPutStorageServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoPutStorageServiceImpl.java index 6a08539..499e307 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoPutStorageServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoPutStorageServiceImpl.java @@ -1,5 +1,4 @@ package com.nov.KgLowDurable.service.Impl; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -20,7 +19,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; - import java.math.BigDecimal; import java.math.RoundingMode; import java.util.ArrayList; @@ -49,6 +47,9 @@ public class LdTwoPutStorageServiceImpl extends ServiceImpl getTwoPutStorageList(Date startTime, Date endTime, String inOperator, String demandDepartment, Integer pageNum, Integer pageSize) { @@ -66,126 +67,374 @@ public class LdTwoPutStorageServiceImpl extends ServiceImpl ldTwoPutStorageDetailList = twoPutStorageDetailService.getByTwoPutStorageId(dto.getLdTwoPutStorage().getId()); +// for (LdTwoPutStorageDetail ldTwoPutStorageDetail : ldTwoPutStorageDetailList) { +// ldTwoPutStorageDetail.setInboundStatus(BatchConstant.ABOVE_WAREHOUSE).setInboundPerson(dto.getUserInfoVO().getName()).setInboundTime(new Date()); +// boolean update = twoPutStorageDetailService.updateById(ldTwoPutStorageDetail); +// if(!update){ +// throw new CustomerException("提交失败"); +// } +// if(BatchConstant.CONSUMER.equals(ldTwoPutStorageDetail.getType())){ +// // 查询易耗库存 +// LdConsumerForm ldConsumerForm = consumerFormService.getByMaterialId(ldTwoPutStorageDetail.getMaterialId()); +// if(null == ldConsumerForm){ +// ldConsumerForm = new LdConsumerForm() +// .setMaterialId(ldTwoPutStorageDetail.getMaterialId()) +// .setMaterialName(ldTwoPutStorageDetail.getMaterialName()) +// .setMaterialCode(ldTwoPutStorageDetail.getMaterialCode()) +// .setOnePutMaterialCode(ldTwoPutStorageDetail.getOnePutMaterialCode()) +// .setModel(ldTwoPutStorageDetail.getModel()) +// .setType(ldTwoPutStorageDetail.getType()) +// .setUnit(ldTwoPutStorageDetail.getUnit()) +// .setNum(ldTwoPutStorageDetail.getInboundQuantity()) +// .setUnitPrice(ldTwoPutStorageDetail.getUnitPrice()) +// .setAmount(ldTwoPutStorageDetail.getInboundQuantity() +// .multiply(ldTwoPutStorageDetail.getUnitPrice())) +// .setDepartmentId(ldTwoPutStorageDetail.getDemandDepartment()) +// .setDepartment(ldTwoPutStorageDetail.getDemandDepartmentName()); +// consumerFormService.save(ldConsumerForm); +// }else { +// // 数量 = 原数量 + 入库数量 +// BigDecimal originalNum = ldConsumerForm.getNum() != null ? ldConsumerForm.getNum() : BigDecimal.ZERO; +// BigDecimal inboundQuantity = ldTwoPutStorageDetail.getInboundQuantity() != null ? ldTwoPutStorageDetail.getInboundQuantity() : BigDecimal.ZERO; +// BigDecimal newNum = originalNum.add(inboundQuantity); +// ldConsumerForm.setNum(newNum); +// +// // 金额 = 原金额 + 入库金额 +// BigDecimal originalAmount = ldConsumerForm.getAmount() != null ? ldConsumerForm.getAmount() : BigDecimal.ZERO; +// BigDecimal inboundAmount = ldTwoPutStorageDetail.getInboundQuantity().multiply(ldTwoPutStorageDetail.getUnitPrice()); +// BigDecimal newAmount = originalAmount.add(inboundAmount); +// ldConsumerForm.setAmount(newAmount); +// +// // 单价 = 新金额 / 新数量 +// BigDecimal newUnitPrice = BigDecimal.ZERO; +// if (newNum.compareTo(BigDecimal.ZERO) != 0) { +// // 保留6位小数，四舍五入 +// newUnitPrice = newAmount.divide(newNum, 4, RoundingMode.HALF_UP); +// } +// ldConsumerForm.setUnitPrice(newUnitPrice); +// consumerFormService.updateById(ldConsumerForm); +// } +// +// LdTwoInventoryRecord ldTwoInventoryRecord = new LdTwoInventoryRecord(); +// ldTwoInventoryRecord.setConsumerFormId(ldConsumerForm.getId().longValue()); +// ldTwoInventoryRecord.setTransactionType(BatchConstant.PUT_WAREHOUSE); +// ldTwoInventoryRecord.setQuantity(ldTwoPutStorageDetail.getInboundQuantity()); +// ldTwoInventoryRecord.setMoney(ldTwoPutStorageDetail.getUnitPrice()); +// ldTwoInventoryRecord.setOperatorId(dto.getUserInfoVO().getUserId()); +// ldTwoInventoryRecord.setOperatorName(dto.getUserInfoVO().getName()); +// ldTwoInventoryRecord.setOperationTime(new Date()); +// ldTwoInventoryRecord.setDepartmentId(dto.getUserInfoVO().getMainErDepartment()); +// ldTwoInventoryRecord.setDepartmentName(dto.getUserInfoVO().getMainErDepartmentName()); +// boolean saveTwoInventoryRecord = twoInventoryRecordService.save(ldTwoInventoryRecord); +// if(!saveTwoInventoryRecord){ +// throw new IllegalArgumentException("入库记录保存失败"); +// } +// }else { +// // 耐用品 获取入库数量 +// BigDecimal inboundQuantity = ldTwoPutStorageDetail.getInboundQuantity(); +// // 验证数量 +// if (inboundQuantity == null) { +// throw new IllegalArgumentException("入库数量不能为空"); +// } +// // 验证是否为整数 +// if (!isInteger(inboundQuantity)) { +// throw new IllegalArgumentException("耐用品入库数量必须是整数"); +// } +// // 验证是否为正数 +// if (inboundQuantity.compareTo(BigDecimal.ZERO) <= 0) { +// throw new IllegalArgumentException("入库数量必须大于0"); +// } +// // 转换为整数 +// int count = inboundQuantity.intValue(); +// +// System.out.println("开始处理 " + count + " 个耐用品"); +// +// List durableList = new ArrayList<>(); +// // 循环处理每个物品 +// for (int i = 0; i < count; i++) { +// LdDurableForm ldDurableForm = new LdDurableForm() +// .setMaterialId(ldTwoPutStorageDetail.getMaterialId()) +// .setMaterialName(ldTwoPutStorageDetail.getMaterialName()) +// .setMaterialCode(ldTwoPutStorageDetail.getMaterialCode()) +// .setOnePutMaterialCode(ldTwoPutStorageDetail.getOnePutMaterialCode()) +// .setModel(ldTwoPutStorageDetail.getModel()) +// .setType(ldTwoPutStorageDetail.getType()) +// .setUnit(ldTwoPutStorageDetail.getUnit()) +// .setNum(new BigDecimal(1)) +// .setUnitPrice(ldTwoPutStorageDetail.getUnitPrice()) +// .setAmount(ldTwoPutStorageDetail.getUnitPrice()) +// .setDepartmentId(ldTwoPutStorageDetail.getDemandDepartment()) +// .setDepartment(ldTwoPutStorageDetail.getDemandDepartmentName()); +// durableList.add(ldDurableForm); +// } +// durableFormService.saveBatch(durableList); +// } +// } +// +// return true; +// } +// +// /** +// * 判断BigDecimal是否为整数 +// */ +// private boolean isInteger(BigDecimal value) { +// try { +// value.toBigIntegerExact(); +// return true; +// } catch (ArithmeticException e) { +// return false; +// } +// } + + @Override @Transactional(rollbackFor = Exception.class) public boolean submit(LdTwoPutStorageDto dto) { + // 参数校验 + if (dto == null || dto.getLdTwoPutStorage() == null || dto.getUserInfoVO() == null) { + throw new CustomerException("参数不能为空"); + } + + // 1. 更新主表状态 LdTwoPutStorage ldTwoPutStorage = twoPutStorageMapper.selectById(dto.getLdTwoPutStorage().getId()); - if(null == ldTwoPutStorage){ - throw new CustomerException("数据为空"); - } - ldTwoPutStorage.setStatus(BatchConstant.ABOVE_WAREHOUSE); - ldTwoPutStorage.setInOperatorId(dto.getUserInfoVO().getUserId()); - ldTwoPutStorage.setInOperatorName(dto.getUserInfoVO().getName()); - ldTwoPutStorage.setInDate(new Date()); - int updateReturt = twoPutStorageMapper.updateById(ldTwoPutStorage); - if(updateReturt<=0){ - throw new CustomerException("提交失败"); - } - //明细入库 加库存 - List ldTwoPutStorageDetailList = twoPutStorageDetailService.getByTwoPutStorageId(dto.getLdTwoPutStorage().getId()); - for (LdTwoPutStorageDetail ldTwoPutStorageDetail : ldTwoPutStorageDetailList) { - ldTwoPutStorageDetail.setInboundStatus(BatchConstant.ABOVE_WAREHOUSE).setInboundPerson(dto.getUserInfoVO().getName()).setInboundTime(new Date()); - boolean update = twoPutStorageDetailService.updateById(ldTwoPutStorageDetail); - if(!update){ - throw new CustomerException("提交失败"); + if (null == ldTwoPutStorage) { + throw new CustomerException("入库单不存在"); + } + + // 状态检查（防止重复提交） + if (BatchConstant.ABOVE_WAREHOUSE.equals(ldTwoPutStorage.getStatus())) { + throw new CustomerException("该入库单已提交"); + } + + UserInfoVO userInfo = dto.getUserInfoVO(); + Date now = new Date(); + + ldTwoPutStorage.setStatus(BatchConstant.ABOVE_WAREHOUSE) + .setInOperatorId(userInfo.getUserId()) + .setInOperatorName(userInfo.getName()) + .setInDate(now); + + int updateResult = twoPutStorageMapper.updateById(ldTwoPutStorage); + if (updateResult <= 0) { + throw new CustomerException("入库单提交失败"); + } + + // 2. 批量处理明细 + List details = twoPutStorageDetailService.getByTwoPutStorageId(dto.getLdTwoPutStorage().getId()); + if (CollectionUtils.isEmpty(details)) { + throw new CustomerException("入库明细为空"); + } + + // 批量更新明细状态 + List updatedDetails = new ArrayList<>(); + for (LdTwoPutStorageDetail detail : details) { + detail.setInboundStatus(BatchConstant.ABOVE_WAREHOUSE) + .setInboundPerson(userInfo.getName()) + .setInboundTime(now); + updatedDetails.add(detail); + } + boolean updateBatchResult = twoPutStorageDetailService.updateBatchById(updatedDetails); + if (!updateBatchResult) { + throw new CustomerException("明细更新失败"); + } + + // 3. 按类型分别处理 + processConsumerGoods(details, userInfo); // 易耗品 + processDurableGoods(details, userInfo); // 耐用品 + + return true; + } + + /** + * 处理易耗品 + */ + @Transactional(rollbackFor = Exception.class) + private void processConsumerGoods(List details, UserInfoVO userInfo) { + Date now = new Date(); + + for (LdTwoPutStorageDetail detail : details) { + if (!BatchConstant.CONSUMER.equals(detail.getType())) { + continue; } - if(BatchConstant.CONSUMER.equals(ldTwoPutStorageDetail.getType())){ - // 查询易耗库存 - LdConsumerForm ldConsumerForm = consumerFormService.getByMaterialId(ldTwoPutStorageDetail.getMaterialId()); - if(null == ldConsumerForm){ - ldConsumerForm = new LdConsumerForm() - .setMaterialId(ldTwoPutStorageDetail.getMaterialId()) - .setMaterialName(ldTwoPutStorageDetail.getMaterialName()) - .setMaterialCode(ldTwoPutStorageDetail.getMaterialCode()) - .setOnePutMaterialCode(ldTwoPutStorageDetail.getOnePutMaterialCode()) - .setModel(ldTwoPutStorageDetail.getModel()) - .setType(ldTwoPutStorageDetail.getType()) - .setUnit(ldTwoPutStorageDetail.getUnit()) - .setNum(ldTwoPutStorageDetail.getInboundQuantity()) - .setUnitPrice(ldTwoPutStorageDetail.getUnitPrice()) - .setAmount(ldTwoPutStorageDetail.getInboundQuantity() - .multiply(ldTwoPutStorageDetail.getUnitPrice())) - .setDepartmentId(ldTwoPutStorageDetail.getDemandDepartment()) - .setDepartment(ldTwoPutStorageDetail.getDemandDepartmentName()); - consumerFormService.save(ldConsumerForm); - }else { - // 数量 = 原数量 + 入库数量 - BigDecimal originalNum = ldConsumerForm.getNum() != null ? ldConsumerForm.getNum() : BigDecimal.ZERO; - BigDecimal inboundQuantity = ldTwoPutStorageDetail.getInboundQuantity() != null ? ldTwoPutStorageDetail.getInboundQuantity() : BigDecimal.ZERO; - BigDecimal newNum = originalNum.add(inboundQuantity); - ldConsumerForm.setNum(newNum); - - // 金额 = 原金额 + 入库金额 - BigDecimal originalAmount = ldConsumerForm.getAmount() != null ? ldConsumerForm.getAmount() : BigDecimal.ZERO; - BigDecimal inboundAmount = ldTwoPutStorageDetail.getInboundQuantity().multiply(ldTwoPutStorageDetail.getUnitPrice()); - BigDecimal newAmount = originalAmount.add(inboundAmount); - ldConsumerForm.setAmount(newAmount); - - // 单价 = 新金额 / 新数量 - BigDecimal newUnitPrice = BigDecimal.ZERO; - if (newNum.compareTo(BigDecimal.ZERO) != 0) { - // 保留6位小数，四舍五入 - newUnitPrice = newAmount.divide(newNum, 4, RoundingMode.HALF_UP); - } - ldConsumerForm.setUnitPrice(newUnitPrice); - consumerFormService.updateById(ldConsumerForm); - } - }else { - // 耐用品 获取入库数量 - BigDecimal inboundQuantity = ldTwoPutStorageDetail.getInboundQuantity(); - // 验证数量 - if (inboundQuantity == null) { - throw new IllegalArgumentException("入库数量不能为空"); - } - // 验证是否为整数 - if (!isInteger(inboundQuantity)) { - throw new IllegalArgumentException("耐用品入库数量必须是整数"); - } - // 验证是否为正数 - if (inboundQuantity.compareTo(BigDecimal.ZERO) <= 0) { - throw new IllegalArgumentException("入库数量必须大于0"); - } - // 转换为整数 - int count = inboundQuantity.intValue(); - - System.out.println("开始处理 " + count + " 个耐用品"); - - List durableList = new ArrayList<>(); - // 循环处理每个物品 - for (int i = 0; i < count; i++) { - LdDurableForm ldDurableForm = new LdDurableForm() - .setMaterialId(ldTwoPutStorageDetail.getMaterialId()) - .setMaterialName(ldTwoPutStorageDetail.getMaterialName()) - .setMaterialCode(ldTwoPutStorageDetail.getMaterialCode()) - .setOnePutMaterialCode(ldTwoPutStorageDetail.getOnePutMaterialCode()) - .setModel(ldTwoPutStorageDetail.getModel()) - .setType(ldTwoPutStorageDetail.getType()) - .setUnit(ldTwoPutStorageDetail.getUnit()) - .setNum(new BigDecimal(1)) - .setUnitPrice(ldTwoPutStorageDetail.getUnitPrice()) - .setAmount(ldTwoPutStorageDetail.getInboundQuantity() - .multiply(ldTwoPutStorageDetail.getUnitPrice())) - .setDepartmentId(ldTwoPutStorageDetail.getDemandDepartment()) - .setDepartment(ldTwoPutStorageDetail.getDemandDepartmentName()); - durableList.add(ldDurableForm); - } - durableFormService.saveBatch(durableList); + // 参数校验 + validateDetailForConsumer(detail); + + // 处理库存 + LdConsumerForm inventory = consumerFormService.getByMaterialId(detail.getMaterialId()); + + if (inventory == null) { + // 新增库存 + inventory = buildNewConsumerInventory(detail); + consumerFormService.save(inventory); + } else { + // 更新库存 + updateConsumerInventory(inventory, detail); + consumerFormService.updateById(inventory); } + + // 保存入库记录 + saveInventoryRecord(inventory, detail, userInfo, now, BatchConstant.PUT_WAREHOUSE); } + } - return true; + /** + * 处理耐用品 + */ + @Transactional(rollbackFor = Exception.class) + private void processDurableGoods(List details, UserInfoVO userInfo) { + List durableList = new ArrayList<>(); + Date now = new Date(); + + for (LdTwoPutStorageDetail detail : details) { + if (!BatchConstant.DURABLE.equals(detail.getType())) { + continue; + } + + // 参数校验 + validateDetailForDurable(detail); + + BigDecimal inboundQuantity = detail.getInboundQuantity(); + int count = inboundQuantity.intValue(); + + // 批量创建耐用品记录 + for (int i = 0; i < count; i++) { + LdDurableForm durable = new LdDurableForm() + .setMaterialId(detail.getMaterialId()) + .setMaterialName(detail.getMaterialName()) + .setMaterialCode(detail.getMaterialCode()) + .setOnePutMaterialCode(detail.getOnePutMaterialCode()) + .setModel(detail.getModel()) + .setType(detail.getType()) + .setUnit(detail.getUnit()) + .setNum(BigDecimal.ONE) + .setUnitPrice(detail.getUnitPrice()) + .setAmount(detail.getUnitPrice()) + .setDepartmentId(detail.getDemandDepartment()) + .setDepartment(detail.getDemandDepartmentName()); + + durableList.add(durable); + } + } + + if (!durableList.isEmpty()) { + durableFormService.saveBatch(durableList); + } } /** - * 判断BigDecimal是否为整数 + * 校验易耗品明细 */ - private boolean isInteger(BigDecimal value) { + private void validateDetailForConsumer(LdTwoPutStorageDetail detail) { + if (detail.getInboundQuantity() == null || detail.getInboundQuantity().compareTo(BigDecimal.ZERO) <= 0) { + throw new CustomerException("易耗品入库数量必须大于0"); + } + if (detail.getUnitPrice() == null || detail.getUnitPrice().compareTo(BigDecimal.ZERO) < 0) { + throw new CustomerException("单价不能为负数"); + } + } + + /** + * 校验耐用品明细 + */ + private void validateDetailForDurable(LdTwoPutStorageDetail detail) { + if (detail.getInboundQuantity() == null) { + throw new CustomerException("入库数量不能为空"); + } + + // 验证是否为整数 try { - value.toBigIntegerExact(); - return true; + detail.getInboundQuantity().intValueExact(); } catch (ArithmeticException e) { - return false; + throw new CustomerException("耐用品入库数量必须是整数"); + } + + if (detail.getInboundQuantity().compareTo(BigDecimal.ZERO) <= 0) { + throw new CustomerException("入库数量必须大于0"); + } + } + + /** + * 创建新的易耗品库存 + */ + private LdConsumerForm buildNewConsumerInventory(LdTwoPutStorageDetail detail) { + BigDecimal amount = detail.getInboundQuantity().multiply(detail.getUnitPrice()); + + return new LdConsumerForm() + .setMaterialId(detail.getMaterialId()) + .setMaterialName(detail.getMaterialName()) + .setMaterialCode(detail.getMaterialCode()) + .setOnePutMaterialCode(detail.getOnePutMaterialCode()) + .setModel(detail.getModel()) + .setType(detail.getType()) + .setUnit(detail.getUnit()) + .setNum(detail.getInboundQuantity()) + .setUnitPrice(detail.getUnitPrice()) + .setAmount(amount) + .setDepartmentId(detail.getDemandDepartment()) + .setDepartment(detail.getDemandDepartmentName()); + } + + /** + * 更新易耗品库存 + */ + private void updateConsumerInventory(LdConsumerForm inventory, LdTwoPutStorageDetail detail) { + BigDecimal originalNum = inventory.getNum() != null ? inventory.getNum() : BigDecimal.ZERO; + BigDecimal inboundQuantity = detail.getInboundQuantity() != null ? detail.getInboundQuantity() : BigDecimal.ZERO; + + // 更新数量 + BigDecimal newNum = originalNum.add(inboundQuantity); + inventory.setNum(newNum); + + // 更新金额 + BigDecimal originalAmount = inventory.getAmount() != null ? inventory.getAmount() : BigDecimal.ZERO; + BigDecimal inboundAmount = inboundQuantity.multiply(detail.getUnitPrice()); + BigDecimal newAmount = originalAmount.add(inboundAmount); + inventory.setAmount(newAmount); + + // 重新计算单价（加权平均） + if (newNum.compareTo(BigDecimal.ZERO) > 0) { + BigDecimal newUnitPrice = newAmount.divide(newNum, 6, RoundingMode.HALF_UP); + inventory.setUnitPrice(newUnitPrice); + } + } + + /** + * 保存出入库记录 + */ + private void saveInventoryRecord(LdConsumerForm inventory, LdTwoPutStorageDetail detail, + UserInfoVO userInfo, Date operationTime, String transactionType) { + LdTwoInventoryRecord record = new LdTwoInventoryRecord() + .setConsumerFormId(inventory.getId().longValue()) + .setTransactionType(transactionType) + .setQuantity(detail.getInboundQuantity()) + .setMoney(detail.getUnitPrice()) + .setOperatorId(userInfo.getUserId()) + .setOperatorName(userInfo.getName()) + .setOperationTime(operationTime) + .setDepartmentId(userInfo.getMainErDepartment()) + .setDepartmentName(userInfo.getMainErDepartmentName()); + + boolean saved = twoInventoryRecordService.save(record); + if (!saved) { + throw new CustomerException("出入库记录保存失败"); } } } diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/UserServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/UserServiceImpl.java index 4cb8a60..d14970b 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/UserServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/UserServiceImpl.java @@ -1,16 +1,11 @@ package com.nov.KgLowDurable.service.Impl; - import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nov.KgLowDurable.mapper.DepartmentMapper; import com.nov.KgLowDurable.mapper.UserMapper; -import com.nov.KgLowDurable.pojo.entity.Department; import com.nov.KgLowDurable.pojo.entity.LdApprove; import com.nov.KgLowDurable.pojo.entity.User; -import com.nov.KgLowDurable.pojo.vo.DepartmentVO; import com.nov.KgLowDurable.pojo.vo.UserInfoVO; -import com.nov.KgLowDurable.service.IDepartmentService; import com.nov.KgLowDurable.service.ILdApproveService; import com.nov.KgLowDurable.service.IUserService; import com.nov.KgLowDurable.util.HttpUtils; @@ -18,7 +13,6 @@ import lombok.AllArgsConstructor; import org.apache.http.util.EntityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - import java.time.LocalDateTime; import java.util.HashMap; import java.util.List; diff --git a/src/main/resources/mapper/LdApproveMapper.xml b/src/main/resources/mapper/LdApproveMapper.xml index f6bf375..84caadf 100644 --- a/src/main/resources/mapper/LdApproveMapper.xml +++ b/src/main/resources/mapper/LdApproveMapper.xml @@ -14,7 +14,7 @@ diff --git a/src/main/resources/mapper/LdTwoInventoryRecordMapper.xml b/src/main/resources/mapper/LdTwoInventoryRecordMapper.xml new file mode 100644 index 0000000..e1a71fd --- /dev/null +++ b/src/main/resources/mapper/LdTwoInventoryRecordMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + +