fix: 新增主生成计划的申请单编号不能重复,报工查看详情数据重复问题

gongchunyi

昨天 90869d75f496350fcb11587010fef20fba16157b

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

@@ -120,6 +120,10 @@
        //  查询主生产计划
        List<ProductionPlanDto> plans = productionPlanMapper.selectWithMaterialByIds(productionPlanDto.getIds());

        if (plans == null || plans.isEmpty()) {
            throw new ServiceException("下发失败,生产计划不存在");
        }

        //  校验是否存在不同的产品名称
        String firstProductName = plans.get(0).getProductName();
        if (plans.stream().anyMatch(p -> p.getProductName() == null || !p.getProductName().equals(firstProductName))) {
@@ -148,7 +152,7 @@
        productOrder.setPlanCompleteTime(productionPlanDto.getPlanCompleteTime());
        productOrder.setStatus(ProductOrderStatusEnum.WAIT.getCode());
        productOrder.setStrength(productionPlanDto.getStrength());
        productOrder.setProductMaterialSkuId(productionPlanDto.getProductMaterialSkuId());
        productOrder.setProductMaterialSkuId(plans.get(0).getProductMaterialSkuId());

        Long orderId = productOrderService.insertProductOrder(productOrder);

@@ -221,6 +225,14 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean add(ProductionPlanDto productionPlanDto) {
        if (StringUtils.isEmpty(productionPlanDto.getApplyNo())) {
            throw new ServiceException("新增失败，申请单编号不能为空");
        }
        Long count = productionPlanMapper.selectCount(Wrappers.<ProductionPlan>lambdaQuery()
                .eq(ProductionPlan::getApplyNo, productionPlanDto.getApplyNo()));
        if (count > 0) {
            throw new ServiceException("新增失败，申请单编号 " + productionPlanDto.getApplyNo() + " 已存在");
        }
        productionPlanDto.setDataSourceType(DataSourceTypeEnum.MANUAL.getCode());
        productionPlanDto.setStatus(0);
        productionPlanMapper.insert(productionPlanDto);
@@ -230,16 +242,37 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean update(ProductionPlanDto productionPlanDto) {
        // 已下发状态，不能编辑
        if (productionPlanDto.getStatus() != 0) {
            throw new BaseException("已下发或部分下发状态，不能编辑");
        if (productionPlanDto == null || productionPlanDto.getId() == null) {
            throw new ServiceException("编辑失败,数据不能为空");
        }
        ProductionPlan productionPlan = getById(productionPlanDto.getId());
        if (productionPlan == null) {
            throw new ServiceException("编辑失败,主生产计划不存在");
        }

        if (StringUtils.isNotEmpty(productionPlanDto.getApplyNo())
                && !productionPlanDto.getApplyNo().equals(productionPlan.getApplyNo())) {

            Long count = productionPlanMapper.selectCount(Wrappers.<ProductionPlan>lambdaQuery()
                    .eq(ProductionPlan::getApplyNo, productionPlanDto.getApplyNo())
                    .ne(ProductionPlan::getId, productionPlanDto.getId())); // 排除自身

            if (count > 0) {
                throw new ServiceException("编辑失败，申请单编号 " + productionPlanDto.getApplyNo() + " 已被占用");
            }
        }
        // 已下发状态，不能编辑
        if (productionPlan.getStatus() != 0) {
            throw new BaseException("编辑失败,该生产计划已下发或部分下发状态,禁止编辑");
        }

        // 查询是否有关联订单
        boolean hasProductOrderPlan = productOrderPlanMapper.selectList(Wrappers.<ProductOrderPlan>lambdaQuery().eq(ProductOrderPlan::getProductionPlanId, productionPlanDto.getId())).stream().anyMatch(p -> p.getProductOrderId() != null);
        boolean hasProductOrderPlan = productOrderPlanMapper.selectList(Wrappers.<ProductOrderPlan>lambdaQuery()
                        .eq(ProductOrderPlan::getProductionPlanId, productionPlanDto.getId()))
                .stream().anyMatch(p -> p.getProductOrderId() != null);

        if (hasProductOrderPlan) {
            //  如果关联，方数只能递增
            ProductionPlan currentPlan = productionPlanMapper.selectById(productionPlanDto.getId());
            if (productionPlanDto.getVolume().compareTo(currentPlan.getVolume()) < 0) {
            if (productionPlanDto.getVolume().compareTo(productionPlan.getVolume()) < 0) {
                throw new BaseException("方数不能递减");
            }
        }
@@ -479,7 +512,7 @@
            entity.setAssignedQuantity(BigDecimal.ZERO);
            entity.setCreateTime(LocalDateTime.now());
            entity.setUpdateTime(LocalDateTime.now());
            entity.setDataSourceType(DataSourceTypeEnum.DING_TALK.getCode());
            entity.setDataSourceType(DataSourceTypeEnum.MANUAL.getCode());

            // 根据物料编码填充关联ID
            if (StringUtils.isNotEmpty(dto.getMaterialCode())) {