consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
@@ -1,8 +1,26 @@ package com.consum.base.controller; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.TemplateExportParams; import cn.hutool.core.util.ReflectUtil; 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.Map.Entry; 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 com.consum.base.BaseController; import com.consum.base.core.utils.CommonUtil; import com.consum.base.core.utils.IdUtil; @@ -20,31 +38,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.*; 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.impl.LWhFormTransferCoreService; import com.consum.model.po.*; 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.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 调拨管理 @@ -413,41 +431,39 @@ } List<GoodsUseRecordVO> goodsUseRecordList = Lists.newArrayList(); // 分组 Map<Long, Map<Long, List<UseRecordDTO>>> collect = useRecordDTOList.stream().collect( Collectors.groupingBy(UseRecordDTO::getId, Collectors.groupingBy(UseRecordDTO::getBaseGoodsModelsId))); // 开始循环collect for (Map.Entry<Long, Map<Long, List<UseRecordDTO>>> entry : collect.entrySet()) { Map<Long, List<UseRecordDTO>> groupedRecords = useRecordDTOList.stream().collect(Collectors.groupingBy(UseRecordDTO::getId)); for (Entry<Long, List<UseRecordDTO>> entry : groupedRecords.entrySet()) { Long id = entry.getKey(); Map<Long, List<UseRecordDTO>> value = entry.getValue(); List<UseRecordDTO> useRecordList = entry.getValue(); UseRecordDTO useRecordDto = useRecordList.get(0); // 开始循环value GoodsUseRecordVO goodsUseRecordVO = new GoodsUseRecordVO(); goodsUseRecordVO.setId(id); goodsUseRecordVO.setUpdateUserName(useRecordDto.getUpdateUserName()); goodsUseRecordVO.setUpdateTime(useRecordDto.getUpdateTime()); 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()); useRecordList.stream().collect(Collectors.groupingBy(UseRecordDTO::getProcureModelId)) .forEach((key, 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()); RecordUserInfoVO recordUserInfoVO = new RecordUserInfoVO(); recordUserInfoVO.setUseName(useRecordDto.getUseName()); recordUserInfoVO.setPhone(useRecordDto.getPhone()); recordUserInfoVO.setNum(useRecordDto.getNum()); recordUserInfoList.add(recordUserInfoVO); useRecordSkuVO.setBaseGoodModelId(useRecordDTO.getBaseGoodsModelsId()); useRecordSkuVO.setBaseGoodModelName(useRecordDTO.getBaseGoodsModelsName()); useRecordSkuVO.setUnit(useRecordDTO.getUnit()); useRecordSkuVO.setProcureModelId(useRecordDTO.getProcureModelId()); List<RecordUserInfoVO> recordUserInfoList = Lists.newArrayList(); for (UseRecordDTO userInfo : recordList) { RecordUserInfoVO recordUserInfoVO = new RecordUserInfoVO(); recordUserInfoVO.setUseName(userInfo.getUseName()); recordUserInfoVO.setPhone(userInfo.getPhone()); recordUserInfoVO.setNum(userInfo.getNum()); recordUserInfoList.add(recordUserInfoVO); } useRecordSkuVO.setRecordUserInfos(recordUserInfoList); useRecordSkuList.add(useRecordSkuVO); goodsUseRecordVO.setRecordSkuDtoList(useRecordSkuList); goodsUseRecordList.add(goodsUseRecordVO); } } }); goodsUseRecordVO.setRecordSkuDtoList(useRecordSkuList); goodsUseRecordList.add(goodsUseRecordVO); } // 分组之后重新排序 List<GoodsUseRecordVO> result = goodsUseRecordList consum-base/src/main/java/com/consum/base/core/type/TransferBusinessType.java
New file @@ -0,0 +1,44 @@ package com.consum.base.core.type; /** * 调拨业务类型 * * @author asus * @version 2023/12/08 09:50 **/ public enum TransferBusinessType { /** * 仓库调拨 */ STOCK_TRANSFER(0, "仓库调拨"), /** * 部门分发 */ DEPARTMENT_PROCURE(1, "部门分发"); private Integer value; private String desc; TransferBusinessType(Integer value, String desc) { this.value = value; this.desc = desc; } public Integer getValue() { return value; } public void setValue(Integer value) { this.value = value; } public String getDesc() { return desc; } public void setDesc(String desc) { this.desc = desc; } } consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
@@ -5,7 +5,6 @@ import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.stream.Collectors; import org.apache.commons.compress.utils.Lists; @@ -18,6 +17,7 @@ import com.consum.base.core.CodeGeneratorEnum; import com.consum.base.core.CodeGeneratorService; import com.consum.base.core.type.CategoryType; import com.consum.base.core.type.TransferBusinessType; import com.consum.base.core.utils.CurrencyUtil; import com.consum.base.core.utils.IdUtil; import com.consum.base.core.utils.MapUtils; @@ -99,23 +99,20 @@ lWhFormTransfer.setId(lWhFormTransferId); Integer businessType = param.getTransferBusinessType(); // 单据类型。0仓库调拨；1部门分发；2部门物品回退 // TODO 枚举字典 // 单据类型。0仓库调拨；1部门分发 lWhFormTransfer.setBusinessType(businessType); CodeGeneratorEnum codeGeneratorEnum = null; if (businessType == 0) { if (businessType == TransferBusinessType.STOCK_TRANSFER.getValue()) { codeGeneratorEnum = CodeGeneratorEnum.Transfer; } else if (businessType == 1) { } else if (businessType == TransferBusinessType.DEPARTMENT_PROCURE.getValue()) { codeGeneratorEnum = CodeGeneratorEnum.Distribute; } else if (businessType == 2) { codeGeneratorEnum = CodeGeneratorEnum.GOBACK; } lWhFormTransfer.setBusinessFormCode(codeGeneratorService.createBusinessFormCode(codeGeneratorEnum)); Long warehouseId = param.getInWarehouseId(); // 调拨类型单据 if (businessType == 0) { if (businessType == TransferBusinessType.STOCK_TRANSFER.getValue()) { // 入库仓库为当前用户的默认仓库 String tenantId = sysInfo.getTenantId(); String tenantName = sysInfo.getTenantName(); @@ -130,7 +127,7 @@ lWhFormTransfer.setInAgencyName(tenantName); } // 当业务类型为部门分发时 添加部门分发记录和使用人 if (businessType == 1) { if (businessType == TransferBusinessType.DEPARTMENT_PROCURE.getValue()) { // 部门分发类型 出库仓库类型0机构1部门 // 从当前登录库管人从库中出库，入到所选部门的下 @@ -143,29 +140,27 @@ log.error("该用户不是库管员"); throw new Exception("该用户不是库管员"); } Optional<BaseWarehouseManager> first = managerList.stream().findFirst(); if (first.isPresent()) { BaseWarehouseManager baseWarehouseManager = first.get(); Long baseWarehouseId = baseWarehouseManager.getBaseWarehouseId(); BaseWarehouse baseWarehouse = new BaseWarehouse(); baseWarehouse.setId(baseWarehouseId); BaseWarehouse warehouse = baseWarehouseService.get(baseWarehouse); BaseWarehouseManager baseWarehouseManager = managerList.stream().findFirst().orElse(null); Long baseWarehouseId = baseWarehouseManager.getBaseWarehouseId(); BaseWarehouse baseWarehouse = new BaseWarehouse(); baseWarehouse.setId(baseWarehouseId); BaseWarehouse warehouse = baseWarehouseService.get(baseWarehouse); lWhFormTransfer.setInWarehouseType(1); lWhFormTransfer.setInWarehouseId(param.getDepartmentId()); lWhFormTransfer.setInWarehouseName(param.getDepartmentName()); lWhFormTransfer.setInOperatorName(param.getOperatorName()); lWhFormTransfer.setInTime(param.getCreateTime()); lWhFormTransfer.setInWarehouseType(1); lWhFormTransfer.setInWarehouseId(param.getDepartmentId()); lWhFormTransfer.setInWarehouseName(param.getDepartmentName()); lWhFormTransfer.setInOperatorName(param.getOperatorName()); lWhFormTransfer.setInTime(param.getCreateTime()); lWhFormTransfer.setOutWarehouseType(0); lWhFormTransfer.setOutWarehouseId(warehouse.getId()); lWhFormTransfer.setOutWarehouseName(warehouse.getWarehouseName()); lWhFormTransfer.setOutWarehouseType(0); lWhFormTransfer.setOutWarehouseId(warehouse.getId()); lWhFormTransfer.setOutWarehouseName(warehouse.getWarehouseName()); lWhFormTransfer.setOutOperatorId(sysInfo.getId()); lWhFormTransfer.setOutOperatorName(sysInfo.getUserName()); lWhFormTransfer.setOutputTime(param.getCreateTime()); lWhFormTransfer.setTel(param.getTel()); } lWhFormTransfer.setOutOperatorId(sysInfo.getId()); lWhFormTransfer.setOutOperatorName(sysInfo.getUserName()); lWhFormTransfer.setOutputTime(param.getCreateTime()); lWhFormTransfer.setTel(param.getTel()); } // 根据机构id查询调拨机构 @@ -190,6 +185,23 @@ // 2.新增物品型号记录 List<LWhFormTransferGoodsInfoParam> transferGoods = param.getTransferGoods(); List<LWhProcureModel> modelList = new ArrayList<>(); // 判断添加一次使用人记录 List<LWhFormTransferGoodsInfoParam> type = transferGoods.stream() .filter( item -> businessType == TransferBusinessType.DEPARTMENT_PROCURE.getValue() && item.getModels().stream() .anyMatch(model -> baseGoodsModelsService.queryGoodsModelInfo(model.getBaseGoodsModelsId()).stream() .findFirst().orElse(null).get("type").equals(CategoryType.TYPE_A.getValue()))) .collect(Collectors.toList()); LWhProcureModelUserRecord lWhProcureModelUserRecord = new LWhProcureModelUserRecord(); if (CollectionUtils.isEmpty(type)) { lWhProcureModelUserRecord.setId(IdUtil.generateId()); lWhProcureModelUserRecord.setTransBusinessId(lWhFormTransferId); lWhProcureModelUserRecord.setOperatorId(sysInfo.getId()); lWhProcureModelUserRecord.setOperatorName(sysInfo.getUserName()); lWhProcureModelUserRecord.setDealTime(DateUtils.getDateTimeNumber(System.currentTimeMillis())); lWhProcureModelUserRecordService.insert(lWhProcureModelUserRecord); } for (LWhFormTransferGoodsInfoParam transferGoodsInfo : transferGoods) { for (LWhTransferModelParam model : transferGoodsInfo.getModels()) { LWhProcureModel lWhProcureModel = new LWhProcureModel(); @@ -197,13 +209,13 @@ // 调拨业务类型转换到物品类型 // 物品类型 1 采购2 调拨 3出库4部门分发 Long baseGoodsModelsId = model.getBaseGoodsModelsId(); if (businessType == 0) { if (businessType == TransferBusinessType.STOCK_TRANSFER.getValue()) { lWhProcureModel.setBusinessType(2); // 根据物品型号查询物品库存 int goodsNum = lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, 1, null); lWhProcureModel.setWorehouseCount(goodsNum); } if (businessType == 1) { if (businessType == TransferBusinessType.DEPARTMENT_PROCURE.getValue()) { lWhProcureModel.setBusinessType(4); } lWhProcureModel.setCounts(model.getCounts()); @@ -223,16 +235,8 @@ // 3.当业务类型为部门分发时 添加部门分发记录和使用人 // 单据类型 1 采购2 调拨 3出库4部门分发 // 部门分发类型 if (businessType == 1 && CategoryType.TYPE_A.getValue().equals(baseModelMap.get("type"))) { // TODO 重复保存 LWhProcureModelUserRecord lWhProcureModelUserRecord = new LWhProcureModelUserRecord(); lWhProcureModelUserRecord.setId(IdUtil.generateId()); lWhProcureModelUserRecord.setTransBusinessId(lWhFormTransferId); lWhProcureModelUserRecord.setOperatorId(sysInfo.getId()); lWhProcureModelUserRecord.setOperatorName(sysInfo.getUserName()); lWhProcureModelUserRecord.setDealTime(DateUtils.getDateTimeNumber(System.currentTimeMillis())); lWhProcureModelUserRecordService.insert(lWhProcureModelUserRecord); if (businessType == TransferBusinessType.DEPARTMENT_PROCURE.getValue() && CategoryType.TYPE_A.getValue().equals(baseModelMap.get("type"))) { List<LWhProcureModelUser> procureModelUserList = Lists.newArrayList(); for (LWhProcureModelUserParam lWhProcureModelUserParam : model.getProcureModelUserList()) { LWhProcureModelUser lWhProcureModelUser = new LWhProcureModelUser(); @@ -385,7 +389,8 @@ // 部门分发需要查询使用信息 Integer businessType = result.getBusinessType(); String type = goodsTemplateInfoVO.getType(); if (businessType == 1 && CategoryType.TYPE_A.getValue().equals(type)) { if (businessType == TransferBusinessType.DEPARTMENT_PROCURE.getValue() && CategoryType.TYPE_A.getValue().equals(type)) { Long procureModelId = goodsModelVO.getId(); LWhProcureModelUser lWhProcureModelUser = new LWhProcureModelUser();
