From 11fc11e498bc322684d30e2bdb73ebab541051b2 Mon Sep 17 00:00:00 2001 From: sunjianxi <839419401@qq.com> Date: Mon, 9 Feb 2026 09:04:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../KgLowDurable/constant/BatchConstant.java | 2 +- .../controller/LdTwoOutStorageController.java | 11 ++++- .../mapper/LdTwoOutStorageMapper.java | 2 + .../pojo/dto/LdTwoInventoryDto.java | 2 +- .../LdTwoOutStorageDetailServiceImpl.java | 6 +-- .../Impl/LdTwoOutStorageServiceImpl.java | 43 +++++++++++++++---- .../mapper/LdTwoOutStorageMapper.xml | 3 ++ 7 files changed, 55 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/nov/KgLowDurable/constant/BatchConstant.java b/src/main/java/com/nov/KgLowDurable/constant/BatchConstant.java index 3090160..bd3673f 100644 --- a/src/main/java/com/nov/KgLowDurable/constant/BatchConstant.java +++ b/src/main/java/com/nov/KgLowDurable/constant/BatchConstant.java @@ -80,7 +80,7 @@ public interface BatchConstant { /** * 出库类型 */ - String OUT_STORAGE_TYPE = "1"; + String OUT_STORAGE_TYPE = "3"; /** 耐用品状态*/ /** diff --git a/src/main/java/com/nov/KgLowDurable/controller/LdTwoOutStorageController.java b/src/main/java/com/nov/KgLowDurable/controller/LdTwoOutStorageController.java index 8ecb163..877cf9f 100644 --- a/src/main/java/com/nov/KgLowDurable/controller/LdTwoOutStorageController.java +++ b/src/main/java/com/nov/KgLowDurable/controller/LdTwoOutStorageController.java @@ -1,5 +1,6 @@ package com.nov.KgLowDurable.controller; import com.nov.KgLowDurable.pojo.dto.LdTwoOutStorageDto; +import com.nov.KgLowDurable.pojo.vo.GroupVO; import com.nov.KgLowDurable.service.ILdTwoOutStorageService; import com.nov.KgLowDurable.util.Result; import io.swagger.annotations.*; @@ -7,7 +8,10 @@ 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.ArrayList; import java.util.Date; +import java.util.List; /** @@ -60,8 +64,13 @@ public class LdTwoOutStorageController { @ApiOperationSort(4) @ApiOperation(value = "获取二级出库分组名称", notes = "获取分组名称", httpMethod = "GET", response = Result.class) public Result getOutGroupName() { - +// List list = new ArrayList<>(); +// GroupVO vo = new GroupVO(); +// vo.setGroupName("测试"); +// vo.setGroupIds("1"); +// list.add(vo); return Result.OK(twoOutStorageService.getOutGroupName()); +// return Result.OK(list); } diff --git a/src/main/java/com/nov/KgLowDurable/mapper/LdTwoOutStorageMapper.java b/src/main/java/com/nov/KgLowDurable/mapper/LdTwoOutStorageMapper.java index 29a6061..21d9ca3 100644 --- a/src/main/java/com/nov/KgLowDurable/mapper/LdTwoOutStorageMapper.java +++ b/src/main/java/com/nov/KgLowDurable/mapper/LdTwoOutStorageMapper.java @@ -17,4 +17,6 @@ public interface LdTwoOutStorageMapper extends BaseMapper { @Param("endTime") Date endTime, @Param("shipperName") String shipperName, @Param("departmentId") String departmentId); + + void updatePersonGroup(@Param("year") String year, @Param("quarter") String quarter, @Param("groupName") String groupName); } diff --git a/src/main/java/com/nov/KgLowDurable/pojo/dto/LdTwoInventoryDto.java b/src/main/java/com/nov/KgLowDurable/pojo/dto/LdTwoInventoryDto.java index 2cfdfcf..39e55d0 100644 --- a/src/main/java/com/nov/KgLowDurable/pojo/dto/LdTwoInventoryDto.java +++ b/src/main/java/com/nov/KgLowDurable/pojo/dto/LdTwoInventoryDto.java @@ -12,7 +12,7 @@ public class LdTwoInventoryDto { /** * 库存ID 耐用品/易耗品 */ - private Long twoInventoryId; + private Long id; /** * 物资类型 YH/NY 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 b86f3af..9574b9c 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageDetailServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageDetailServiceImpl.java @@ -1,4 +1,4 @@ -package com.nov.KgLowDurable.service.Impl; +package com.nov.KgLowDurable.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nov.KgLowDurable.constant.BatchConstant; import com.nov.KgLowDurable.mapper.LdTwoOutStorageDetailMapper; @@ -54,13 +54,13 @@ public class LdTwoOutStorageDetailServiceImpl extends ServiceImpl consumerIds = materialDto.stream() .filter(dto -> BatchConstant.CONSUMER.equals(dto.getType())) - .map(LdTwoInventoryDto::getTwoInventoryId) + .map(LdTwoInventoryDto::getId) .collect(Collectors.toList()); // 获取耐用型类型的twoInventoryId列表 List durableIds = materialDto.stream() .filter(dto -> BatchConstant.DURABLE.equals(dto.getType())) - .map(LdTwoInventoryDto::getTwoInventoryId) + .map(LdTwoInventoryDto::getId) .collect(Collectors.toList()); List twoInventoryList = new ArrayList<>(); 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 7b5ec15..d9c52ca 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageServiceImpl.java @@ -1,4 +1,4 @@ -package com.nov.KgLowDurable.service.Impl; +package com.nov.KgLowDurable.service.impl; import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fasterxml.jackson.core.JsonProcessingException; @@ -26,6 +26,7 @@ import org.springframework.util.CollectionUtils; import java.math.BigDecimal; import java.math.RoundingMode; +import java.time.LocalDate; import java.util.*; import java.util.stream.Collectors; @@ -108,11 +109,20 @@ public class LdTwoOutStorageServiceImpl extends ServiceImpl list = new ArrayList<>(); List ldTwoOutStorageDetailList = dto.getLdTwoOutStorageDetailList(); for (LdTwoOutStorageDetail ldTwoOutStorageDetail : ldTwoOutStorageDetailList) { - ldTwoOutStorageDetail.setTwoOutStorageId(outOneStorageId); - ldTwoOutStorageDetail.setTwoOutStorageNo(ldTwoOutStorage.getOrderNo()); - ldTwoOutStorageDetail.setTwoOutDetailCode(serialNumberUtil.generateSimple("SOD")); - ldTwoOutStorageDetail.setShipperStatus(BatchConstant.NO_SHIPPED_OUT); - ldTwoOutStorageDetail.setOptTime(new Date()); + LdTwoOutStorageDetail detail = new LdTwoOutStorageDetail(); + detail.setTwoInventoryId(ldTwoOutStorageDetail.getId()); + detail.setTwoOutStorageId(outOneStorageId); + detail.setTwoOutStorageNo(ldTwoOutStorage.getOrderNo()); + detail.setTwoOutDetailCode(serialNumberUtil.generateSimple("SOD")); + detail.setShipperStatus(BatchConstant.NO_SHIPPED_OUT); + detail.setOptTime(new Date()); + detail.setMaterialId(ldTwoOutStorageDetail.getMaterialId()); + detail.setMaterialCode(ldTwoOutStorageDetail.getMaterialCode()); + detail.setMaterialName(ldTwoOutStorageDetail.getMaterialName()); + detail.setModel(ldTwoOutStorageDetail.getModel()); + detail.setType(ldTwoOutStorageDetail.getType()); + detail.setUnit(ldTwoOutStorageDetail.getUnit()); + detail.setNum(ldTwoOutStorageDetail.getNum()); //处理剩余库存 BigDecimal num = null; if (BatchConstant.CONSUMER.equals(ldTwoOutStorageDetail.getType())) { @@ -124,9 +134,9 @@ public class LdTwoOutStorageServiceImpl extends ServiceImpl getGroupMaterial(String groupName, String departmentId) { List materialVOList = userService.getGroupMaterial(groupName, departmentId); +// List materialVOList = new ArrayList<>(); +// GroupMaterialVO vo1 = new GroupMaterialVO(); +// vo1.setMaterialId(9L); +// vo1.setMaterialCode("03003YH23"); +// materialVOList.add(vo1); if(!CollectionUtils.isEmpty(materialVOList)){ for (GroupMaterialVO groupMaterialVO : materialVOList) { List list = new ArrayList<>(); diff --git a/src/main/resources/mapper/LdTwoOutStorageMapper.xml b/src/main/resources/mapper/LdTwoOutStorageMapper.xml index 9056b4f..2eebcd4 100644 --- a/src/main/resources/mapper/LdTwoOutStorageMapper.xml +++ b/src/main/resources/mapper/LdTwoOutStorageMapper.xml @@ -32,5 +32,8 @@ order by out_date + + update ld_person_group set is_out = 1 where year = #{year} and quarter = #{quarter} and group_name = #{groupName} +