fix: 产品保存时唯一性导致数据丢失

gongchunyi

2 天以前 c3b81ea987501dc2f5dc3c8db23038eeb8f290e9

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

@@ -302,10 +302,17 @@

        for (ProductMaterialSku sku : list) {

            ProductMaterialSku exist =
                    productMaterialSkuService.getOne(new LambdaQueryWrapper<ProductMaterialSku>()
                            .eq(ProductMaterialSku::getMaterialId, sku.getMaterialId())
                            .eq(ProductMaterialSku::getSpecification, sku.getSpecification()));
            LambdaQueryWrapper<ProductMaterialSku> wrapper = new LambdaQueryWrapper<>();
            wrapper.eq(ProductMaterialSku::getMaterialId, sku.getMaterialId())
                    .eq(ProductMaterialSku::getSpecification, sku.getSpecification());

            if (StringUtils.isNotEmpty(sku.getMaterialCode())) {
                wrapper.eq(ProductMaterialSku::getMaterialCode, sku.getMaterialCode());
            } else {
                wrapper.isNull(ProductMaterialSku::getMaterialCode);
            }

            ProductMaterialSku exist = productMaterialSkuService.getOne(wrapper);
            if (exist == null) {
                productMaterialSkuService.save(sku);
                affected++;
@@ -350,17 +357,13 @@
        for (ProductMaterialConfig materialConfig : materialConfigList) {
            LambdaQueryWrapper<ProductMaterial> wrapper = new LambdaQueryWrapper<>();
            wrapper.eq(ProductMaterial::getMaterialTypeId, materialConfig.getId())
                    .select(ProductMaterial::getId, ProductMaterial::getMaterialName)
                    .like(materialName != null && !materialName.isEmpty(), ProductMaterial::getMaterialName, materialName);
            List<ProductMaterial> productMaterialList = list(wrapper);

            if (productMaterialList != null && !productMaterialList.isEmpty()) {
                ProductMaterialGroupDto dto = new ProductMaterialGroupDto();
                dto.setConfigId(materialConfig.getId());
                dto.setConfigName(materialConfig.getConfigName());
                dto.setMaterialList(productMaterialList);
                productMaterialMap.add(dto);
            }
            ProductMaterialGroupDto dto = new ProductMaterialGroupDto();
            dto.setConfigId(materialConfig.getId());
            dto.setConfigName(materialConfig.getConfigName());
            dto.setMaterialList(productMaterialList);
            productMaterialMap.add(dto);
        }
        return productMaterialMap;
    }