From 951e8fa8b82e56bd02bb6f821be070c21616f744 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期五, 08 十二月 2023 15:28:51 +0800
Subject: [PATCH] feat: 1.调拨不再生成出库单 2.增加出库金额
---
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 135 +++++++++++++++++++-------------------------
1 files changed, 58 insertions(+), 77 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
index 8ba6b3d..7ff0ae1 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
@@ -1,25 +1,8 @@
package com.consum.base.controller;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.compress.utils.Lists;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
+import cn.hutool.core.util.ReflectUtil;
import com.consum.base.BaseController;
import com.consum.base.core.utils.CommonUtil;
import com.consum.base.core.utils.IdUtil;
@@ -37,31 +20,31 @@
import com.consum.base.pojo.response.GoodsTemplateCountVO;
import com.consum.base.pojo.response.LWHFromTransferExtendVO;
import com.consum.base.pojo.response.TransferInfoVO;
-import com.consum.base.service.BaseWarehouseService;
-import com.consum.base.service.LGoodsUserRecordCoreService;
-import com.consum.base.service.LWhFormTransferService;
-import com.consum.base.service.LWhProcureModelService;
-import com.consum.base.service.LWhProcureModelUserRecordService;
-import com.consum.base.service.LWhProcureModelUserService;
+import com.consum.base.service.*;
import com.consum.base.service.impl.LWhFormTransferCoreService;
-import com.consum.model.po.BaseWarehouse;
-import com.consum.model.po.FinSysTenantUser;
-import com.consum.model.po.LWhFormTransfer;
-import com.consum.model.po.LWhProcureModelUser;
-import com.consum.model.po.LWhProcureModelUserRecord;
+import com.consum.model.po.*;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.DateUtils;
import com.walker.web.ResponseValue;
-
-import cn.afterturn.easypoi.excel.ExcelExportUtil;
-import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
-import cn.hutool.core.util.ReflectUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.compress.utils.Lists;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.lang.reflect.Field;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* @Description 璋冩嫧绠＄悊
@@ -279,7 +262,8 @@
lWhFormTransfer.setOutWarehouseId(wareHouseId);
lWhFormTransfer.setOutWarehouseName(warehouseName);
lWhFormTransferService.update(lWhFormTransfer);
- lWhFormTransferCoreService.doTransferOutPut(id, getCurrentUser());
+// lWhFormTransferCoreService.doTransferOutPut(id, getCurrentUser());
+ lWhFormTransferCoreService.doTransferOutPutNew(id, getCurrentUser());
return ResponseValue.success();
}
@@ -419,59 +403,56 @@
@ApiImplicitParams({@ApiImplicitParam(name = "transferOrderId", value = "璋冩嫧鍗昳d", required = true)})
@GetMapping("/use/record")
public ResponseValue useRecord(Long transferOrderId) {
-
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
+
List<UseRecordDTO> useRecordDTOList = lWhProcureModelUserService.selectUseRecord(transferOrderId);
if (CollectionUtils.isEmpty(useRecordDTOList)) {
return ResponseValue.error("鏈煡璇㈠埌浣跨敤璁板綍");
}
- List<GoodsUseRecordVO> goodsUseRecordList = Lists.newArrayList();
- // 鍒嗙粍
- Map<Long, Map<Long, List<UseRecordDTO>>> collect = useRecordDTOList.stream().collect(
- Collectors.groupingBy(UseRecordDTO::getId, Collectors.groupingBy(UseRecordDTO::getBaseGoodsModelsId)));
- // 寮�濮嬪惊鐜痗ollect
- for (Map.Entry<Long, Map<Long, List<UseRecordDTO>>> entry : collect.entrySet()) {
- Long id = entry.getKey();
- Map<Long, List<UseRecordDTO>> value = entry.getValue();
- // 寮�濮嬪惊鐜痸alue
- List<UseRecordSkuVO> useRecordSkuList = Lists.newArrayList();
- for (Map.Entry<Long, List<UseRecordDTO>> item : value.entrySet()) {
- List<UseRecordDTO> list = item.getValue();
- List<RecordUserInfoVO> recordUserInfoList = Lists.newArrayList();
- for (UseRecordDTO useRecordDto : list) {
- GoodsUseRecordVO goodsUseRecordVO = new GoodsUseRecordVO();
- goodsUseRecordVO.setId(id);
- goodsUseRecordVO.setUpdateUserName(useRecordDto.getUpdateUserName());
- goodsUseRecordVO.setUpdateTime(useRecordDto.getUpdateTime());
+ List<GoodsUseRecordVO> goodsUseRecordList = useRecordDTOList.stream()
+ .collect(Collectors.groupingBy(UseRecordDTO::getId)).entrySet().stream().map(entry -> {
+ Long id = entry.getKey();
+ List<UseRecordDTO> useRecordList = entry.getValue();
+ UseRecordDTO useRecordDto = useRecordList.get(0);
- UseRecordSkuVO useRecordSkuVO = new UseRecordSkuVO();
- useRecordSkuVO.setBaseGoodModelId(useRecordDto.getBaseGoodsModelsId());
- useRecordSkuVO.setBaseGoodModelName(useRecordDto.getBaseGoodsModelsName());
- useRecordSkuVO.setUnit(useRecordDto.getUnit());
- useRecordSkuVO.setProcureModelId(useRecordDto.getProcureModelId());
+ GoodsUseRecordVO goodsUseRecordVO = new GoodsUseRecordVO();
+ goodsUseRecordVO.setId(id);
+ goodsUseRecordVO.setUpdateUserName(useRecordDto.getUpdateUserName());
+ goodsUseRecordVO.setUpdateTime(useRecordDto.getUpdateTime());
- RecordUserInfoVO recordUserInfoVO = new RecordUserInfoVO();
- recordUserInfoVO.setUseName(useRecordDto.getUseName());
- recordUserInfoVO.setPhone(useRecordDto.getPhone());
- recordUserInfoVO.setNum(useRecordDto.getNum());
- recordUserInfoList.add(recordUserInfoVO);
- useRecordSkuVO.setRecordUserInfos(recordUserInfoList);
- useRecordSkuList.add(useRecordSkuVO);
- goodsUseRecordVO.setRecordSkuDtoList(useRecordSkuList);
- goodsUseRecordList.add(goodsUseRecordVO);
- }
- }
- }
- // 鍒嗙粍涔嬪悗閲嶆柊鎺掑簭
- List<GoodsUseRecordVO> result = goodsUseRecordList
- .stream().sorted(Comparator
- .comparing(GoodsUseRecordVO::getUpdateTime, Comparator.nullsFirst(Long::compareTo)).reversed())
+ List<UseRecordSkuVO> useRecordSkuList =
+ useRecordList.stream().collect(Collectors.groupingBy(UseRecordDTO::getProcureModelId)).values()
+ .stream().map(recordList -> {
+ UseRecordDTO useRecordDTO = recordList.get(0);
+ UseRecordSkuVO useRecordSkuVO = new UseRecordSkuVO();
+ useRecordSkuVO.setBaseGoodModelId(useRecordDTO.getBaseGoodsModelsId());
+ useRecordSkuVO.setBaseGoodModelName(useRecordDTO.getBaseGoodsModelsName());
+ useRecordSkuVO.setUnit(useRecordDTO.getUnit());
+ useRecordSkuVO.setProcureModelId(useRecordDTO.getProcureModelId());
+
+ List<RecordUserInfoVO> recordUserInfoList = recordList.stream().map(userInfo -> {
+ RecordUserInfoVO recordUserInfoVO = new RecordUserInfoVO();
+ recordUserInfoVO.setUseName(userInfo.getUseName());
+ recordUserInfoVO.setPhone(userInfo.getPhone());
+ recordUserInfoVO.setNum(userInfo.getNum());
+ return recordUserInfoVO;
+ }).collect(Collectors.toList());
+
+ useRecordSkuVO.setRecordUserInfos(recordUserInfoList);
+ return useRecordSkuVO;
+ }).collect(Collectors.toList());
+
+ goodsUseRecordVO.setRecordSkuDtoList(useRecordSkuList);
+ return goodsUseRecordVO;
+ }).sorted(Comparator.comparing(GoodsUseRecordVO::getUpdateTime, Comparator.nullsFirst(Long::compareTo))
+ .reversed())
.collect(Collectors.toList());
- return ResponseValue.success(result);
+
+ return ResponseValue.success(goodsUseRecordList);
}
@ApiOperation(value = "鏌ヨ閮ㄩ棬涓嬬殑鍒嗗彂鍗�", notes = "鏌ヨ閮ㄩ棬涓嬬殑鍒嗗彂鍗�")
--
Gitblit v1.9.1