fix: 调整定时任务时间、移除反射获取同步日期、物料类型同步数据存在类型不对应问题、新增更新修改为批次保存

gongchunyi

18 小时以前 d7001b28850f98c06a077d59d637103b2100dba5

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

@@ -82,8 +82,6 @@
        }

        try {


            JSONArray searchConditions = new JSONArray();
            JSONObject statusCondition = new JSONObject();
            statusCondition.put("key", "processInstanceStatus");
@@ -148,6 +146,9 @@
            material.setRemark(formData.getString("textareaField_l92f36f9"));

            String materialType = formData.getString("selectField_l92f36fb");
            if ("板材".equals(materialType) || "砌块".equals(materialType) || "标砖".equals(materialType)) {
                materialType = "成品";
            }
            String inventoryCat = formData.getString("selectField_la154noy");
            material.setMaterialTypeId(getOrCreateConfigId(materialType, MaterialConfigTypeEnum.MATERIAL_TYPE.name()));
            material.setInventoryCategoryId(getOrCreateConfigId(inventoryCat, MaterialConfigTypeEnum.INVENTORY_CAT.name()));
@@ -224,10 +225,11 @@
        if (list == null || list.isEmpty()) {
            return 0;
        }
        int affected = 0;

        List<ProductMaterialSku> toSave = new ArrayList<>();
        List<ProductMaterialSku> toUpdate = new ArrayList<>();

        for (ProductMaterialSku sku : list) {

            LambdaQueryWrapper<ProductMaterialSku> wrapper = new LambdaQueryWrapper<>();
            wrapper.eq(ProductMaterialSku::getProductId, sku.getProductId())
                    .eq(ProductMaterialSku::getModel, sku.getModel());
@@ -240,20 +242,28 @@

            ProductMaterialSku exist = productMaterialSkuService.getOne(wrapper);
            if (exist == null) {
                productMaterialSkuService.save(sku);
                affected++;
                log.info("新增物料规格 {}", sku.getModel());
                toSave.add(sku);
            } else {
                if (exist.getFormModifiedTime() == null || !exist.getFormModifiedTime().equals(sku.getFormModifiedTime())) {
                    sku.setId(exist.getId());
                    sku.setCreateTime(exist.getCreateTime());
                    productMaterialSkuService.updateById(sku);
                    toUpdate.add(sku);
                }
            }
        }

                    affected++;
                    log.info("更新物料规格 {}", sku.getModel());
        int affected = 0;
        if (!toSave.isEmpty()) {
            productMaterialSkuService.saveBatch(toSave);
            affected += toSave.size();
            log.info("批量新增物料规格 {} 条", toSave.size());
                }
        if (!toUpdate.isEmpty()) {
            productMaterialSkuService.updateBatchById(toUpdate);
            affected += toUpdate.size();
            log.info("批量更新物料规格 {} 条", toUpdate.size());
            }
        }

        return affected;
    }