fix: 手动新增区分

gongchunyi

3 天以前 62522fb4eaf6eb80652eb3f66d713f2fa72ba48c

fix: 手动新增区分

 src/main/java/com/ruoyi/production/pojo/ProductMaterialSku.java

@@ -65,5 +65,5 @@
    private LocalDateTime updateTime;

    @ApiModelProperty("数据来源(1-宜搭/2-钉钉)")
    private Long type;
    private Integer type;
}

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

@@ -107,7 +107,7 @@
            String searchFieldJson = searchConditions.toJSONString();

            LambdaQueryWrapper<ProductMaterialSku> countWrapper = new LambdaQueryWrapper<>();
            countWrapper.eq(ProductMaterialSku::getType, 1L);
            countWrapper.eq(ProductMaterialSku::getType, 1);

            JSONArray dataArr = AliDingUtils.getFormDataList(aliDingConfig, aliDingConfig.getMaterialCodeFormUuid(), searchFieldJson, productMaterialSkuService, ProductMaterialSku::getFormModifiedTime, countWrapper);

@@ -172,7 +172,7 @@
            sku.setFormModifiedTime(AliDingUtils.parseUtcTime(item.getString("modifiedTimeGMT")));
            sku.setCreateTime(now);
            sku.setUpdateTime(now);
            sku.setType(1L);
            sku.setType(1);

            list.add(sku);
        }

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

@@ -107,6 +107,7 @@
            sku.setCreateTime(now);
        }
        sku.setUpdateTime(now);
        sku.setType(2);

        if (!this.save(sku)) {
            throw new ServiceException("新增物料规格失败");
@@ -139,7 +140,7 @@
        if (ids == null || ids.isEmpty()) {
            throw new ServiceException("请选择至少一条数据");
        }
        

        if (productionPlanMapper.selectCount(new LambdaQueryWrapper<ProductionPlan>().in(ProductionPlan::getProductMaterialSkuId, ids)) > 0) {
            throw new ServiceException("该物料已被销售生产计划引用，无法删除");
        }