fix： 生产计划的产品规格与物料编码数据为空

gongchunyi

2 天以前 1536165d57b3c8450cbd53f45c61c36f66cc177c

 src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java

@@ -15,8 +15,10 @@
import com.ruoyi.common.utils.http.HttpUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.config.AliDingConfig;
import com.ruoyi.production.pojo.ProductMaterial;
import com.ruoyi.production.pojo.ProductMaterialSku;
import com.ruoyi.production.pojo.ProductOrder;
import com.ruoyi.production.service.ProductMaterialService;
import com.ruoyi.production.service.ProductMaterialSkuService;
import com.ruoyi.production.service.ProductOrderService;
import com.ruoyi.productionPlan.dto.ProductionPlanDto;
@@ -73,6 +75,9 @@

    @Autowired
    private ProductMaterialSkuService productMaterialSkuService;

    @Autowired
    private ProductMaterialService productMaterialService;

    /**
     * 同步锁，确保手动和定时任务不同时执行
@@ -384,13 +389,23 @@
                plan.setCustomerName(formData.getString("textField_lbkozohg"));

                String materialCode = row.getString("textField_l9xo62q5");
                plan.setMaterialCode(materialCode);
                // 根据物料编码查询物料信息表，关联物料ID
                if (StringUtils.isNotEmpty(materialCode)) {
                    LambdaQueryWrapper<ProductMaterialSku> skuQueryWrapper = new LambdaQueryWrapper<>();
                    skuQueryWrapper.eq(ProductMaterialSku::getMaterialCode, materialCode);
                    ProductMaterialSku sku = productMaterialSkuService.getOne(skuQueryWrapper);
                    if (sku != null && sku.getMaterialId() != null) {
                        plan.setProductMaterialId(sku.getMaterialId().intValue());
                    if (sku != null) {
                        plan.setProductMaterialSkuId(sku.getId());
                        if (sku.getMaterialId() != null) {
                            // 设置产品名称
                            ProductMaterial material = productMaterialService.getById(sku.getMaterialId());
                            if (material != null) {
                                plan.setProductName(material.getMaterialName());
                            }
                        }
                        // 设置规格型号
                        plan.setProductSpec(sku.getSpecification());
                    }
                }

@@ -467,19 +482,19 @@
        //  Map (formInstanceId + materialCode)
        Map<String, ProductionPlan> existMap = new HashMap<>();
        for (ProductionPlan p : existList) {
            String key = p.getFormInstanceId() + "_" + p.getProductMaterialId();
            String key = p.getFormInstanceId() + "_" + p.getProductMaterialSkuId();
            existMap.put(key, p);
        }

        //  遍历同步数据
        for (ProductionPlan plan : list) {
            String key = plan.getFormInstanceId() + "_" + plan.getProductMaterialId();
            String key = plan.getFormInstanceId() + "_" + plan.getProductMaterialSkuId();
            ProductionPlan exist = existMap.get(key);
            if (exist == null) {
                // 新增
                this.save(plan);
                affected++;
                log.info("新增数据 formInstanceId={}, materialCode={}", plan.getFormInstanceId(), plan.getProductMaterialId());
                log.info("新增数据 formInstanceId={}, materialCode={}", plan.getFormInstanceId(), plan.getProductMaterialSkuId());
            } else {
                // 判断是否需要更新
                if (exist.getFormModifiedTime() == null || !exist.getFormModifiedTime().equals(plan.getFormModifiedTime())) {
@@ -487,7 +502,7 @@
                    plan.setCreateTime(exist.getCreateTime());
                    this.updateById(plan);
                    affected++;
                    log.info("更新数据 formInstanceId={}, materialCode={}", plan.getFormInstanceId(), plan.getProductMaterialId());
                    log.info("更新数据 formInstanceId={}, materialCode={}", plan.getFormInstanceId(), plan.getProductMaterialSkuId());
                }
            }
        }
@@ -541,6 +556,23 @@
            entity.setDataSourceType(2);
            entity.setDataSyncType(1);

            // 根据物料编码填充关联ID
            if (StringUtils.isNotEmpty(dto.getMaterialCode())) {
                LambdaQueryWrapper<ProductMaterialSku> skuQueryWrapper = new LambdaQueryWrapper<>();
                skuQueryWrapper.eq(ProductMaterialSku::getMaterialCode, dto.getMaterialCode());
                ProductMaterialSku sku = productMaterialSkuService.getOne(skuQueryWrapper);
                if (sku != null) {
                    entity.setProductMaterialSkuId(sku.getId());
                    if (sku.getMaterialId() != null) {
                        ProductMaterial material = productMaterialService.getById(sku.getMaterialId());
                        if (material != null) {
                            entity.setProductName(material.getMaterialName());
                        }
                    }
                    entity.setProductSpec(sku.getSpecification());
                }
            }

            entityList.add(entity);
        }
        this.saveBatch(entityList);