Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

zss

16 小时以前 8c6aad555647fcecaddfaed99516d8b93db837c8

 src/main/java/com/ruoyi/production/service/impl/ProductMaterialSkuServiceImpl.java

@@ -20,11 +20,7 @@
import org.springframework.web.multipart.MultipartFile;

import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -153,7 +149,7 @@

        ProductMaterial material = productMaterialMapper.selectById(materialId);
        if (material == null) {
            throw new ServiceException("物料不存在");
            throw new ServiceException("主物料信息不存在");
        }

        ExcelUtil<ProductMaterialSkuImportDto> excelUtil = new ExcelUtil<>(ProductMaterialSkuImportDto.class);
@@ -164,70 +160,81 @@
            log.error("导入物料规格Excel解析失败", e);
            throw new ServiceException("Excel解析失败");
        }

        if (importList == null || importList.isEmpty()) {
            throw new ServiceException("Excel没有数据");
            throw new ServiceException("Excel中未检测到有效数据");
        }
        List<Integer> emptyCodeRows = new ArrayList<>();
        int currentRow = 1;

        Map<String, ProductMaterialSkuImportDto> specMap = new LinkedHashMap<>();
        for (ProductMaterialSkuImportDto dto : importList) {
            if (dto == null || StringUtils.isEmpty(dto.getModel())) {
            currentRow++;
            if (dto == null) continue;
            //  物料编码不能为空
            if (StringUtils.isEmpty(dto.getMaterialCode())) {
                emptyCodeRows.add(currentRow);
                continue;
            }
            String specification = dto.getModel().trim();
            if (specification.isEmpty()) {
            if (StringUtils.isEmpty(dto.getModel())) {
                continue;
            }
            specMap.putIfAbsent(specification, dto);

            String modelKey = dto.getModel().trim();
            specMap.putIfAbsent(modelKey, dto);
        }

        if (!emptyCodeRows.isEmpty()) {
            throw new ServiceException("导入失败,以下行号的【物料编码】为空：" + emptyCodeRows.toString());
        }
        if (specMap.isEmpty()) {
            throw new ServiceException("Excel没有有效的规格数据");
            throw new ServiceException("Excel没有有效的规格型号数据");
        }

        Set<String> specifications = specMap.keySet();

        Set<String> modelSet = specMap.keySet();
        List<ProductMaterialSku> existList = this.list(new LambdaQueryWrapper<ProductMaterialSku>()
                .eq(ProductMaterialSku::getProductId, materialId)
                .in(ProductMaterialSku::getModel, specifications));
        Map<String, ProductMaterialSku> existMap = existList.stream()
                .collect(Collectors.toMap(ProductMaterialSku::getModel, sku -> sku, (a, b) -> a));
                .in(ProductMaterialSku::getModel, modelSet));

        Map<String, ProductMaterialSku> existMap = existList.stream().collect(Collectors.toMap(ProductMaterialSku::getModel, sku -> sku, (a, b) -> a));
        LocalDateTime now = LocalDateTime.now();
        List<ProductMaterialSku> saveList = new ArrayList<>();
        List<ProductMaterialSku> updateList = new ArrayList<>();

        for (Map.Entry<String, ProductMaterialSkuImportDto> entry : specMap.entrySet()) {
            String specification = entry.getKey();
            String model = entry.getKey();
            ProductMaterialSkuImportDto dto = entry.getValue();
            String supplyType = StringUtils.isNotEmpty(dto.getSupplyType()) ? dto.getSupplyType().trim() : null;

            ProductMaterialSku exist = existMap.get(specification);
            if (exist == null) {
                ProductMaterialSku sku = new ProductMaterialSku();
                sku.setProductId(materialId);
                sku.setModel(specification);
                sku.setSupplyType(supplyType);
                sku.setCreateTime(now);
                sku.setUpdateTime(now);
                saveList.add(sku);
            String excelMaterialCode = dto.getMaterialCode().trim();
            String excelSupplyType = StringUtils.isNotEmpty(dto.getSupplyType()) ? dto.getSupplyType().trim() : null;
            ProductMaterialSku existSku = existMap.get(model);
            if (existSku == null) {
                ProductMaterialSku newSku = new ProductMaterialSku();
                newSku.setProductId(materialId);
                newSku.setModel(model);
                newSku.setMaterialCode(excelMaterialCode);
                newSku.setSupplyType(excelSupplyType);
                newSku.setCreateTime(now);
                newSku.setUpdateTime(now);
                saveList.add(newSku);
            } else {
                boolean needUpdate = false;
                if (supplyType != null && !supplyType.equals(exist.getSupplyType())) {
                    exist.setSupplyType(supplyType);
                if (!Objects.equals(excelMaterialCode, existSku.getMaterialCode())) {
                    existSku.setMaterialCode(excelMaterialCode);
                    needUpdate = true;
                }
                if (!Objects.equals(excelSupplyType, existSku.getSupplyType())) {
                    existSku.setSupplyType(excelSupplyType);
                    needUpdate = true;
                }
                if (needUpdate) {
                    exist.setUpdateTime(now);
                    updateList.add(exist);
                    existSku.setUpdateTime(now);
                    updateList.add(existSku);
                }
            }
        }

        if (saveList.isEmpty() && updateList.isEmpty()) {
            throw new ServiceException("Excel与现有数据一致，无需导入");
            throw new ServiceException("Excel内容与现有数据完全一致");
        }

        if (!saveList.isEmpty()) {
            this.saveBatch(saveList);
        }
@@ -235,6 +242,6 @@
            this.updateBatchById(updateList);
        }

        log.info("物料规格导入完成 materialId={}, 新增{}条，更新{}条", materialId, saveList.size(), updateList.size());
        log.info("物料规格导入完成! materialId={}, 新增{}条，更新{}条", materialId, saveList.size(), updateList.size());
    }
}