2 天以前 7a6f10169c1f56e7f0394463e1294fd2da3f6725
yys
1.修改bug
已修改3个文件
14 ■■■■■ 文件已修改
src/main/java/com/ruoyi/production/pojo/ProductProcess.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/procurementrecord/ReturnSaleProductMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/production/pojo/ProductProcess.java
@@ -74,7 +74,7 @@
    private Long tenantId;
    @ApiModelProperty(value ="是否质检")
    @Excel(name = "是否质检", readConverterExp = "0=否,1=是")
    @Excel(name = "是否质检", readConverterExp = "否=false,是=true")
    private Boolean isQuality;
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
@@ -290,6 +290,7 @@
        productOrder.setSaleLedgerProductId(salesLedgerProduct.getId());
        String string = productOrderServiceImpl.generateNextOrderNo(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")));
        productOrder.setNpsNo(string);
        productOrder.setStatus("待生产");
        productOrder.setQuantity(salesLedgerProduct.getQuantity());//需求数量
        productOrder.setCompleteQuantity(BigDecimal.ZERO);//完成数量
        productOrderMapper.insert(productOrder);
@@ -307,19 +308,20 @@
                productProcessRouteMapper.insert(productProcessRoute);
                // 绑定生产bom清单
                List<ProductBom> productBoms = productBomMapper.selectList(new LambdaQueryWrapper<ProductBom>()
                        .eq(ProductBom::getProductModelId, processRoute.getProductModelId())
                        .eq(ProductBom::getProductModelId, salesLedgerProduct.getProductModelId())
                        .orderByDesc(ProductBom::getId));
                if(com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isNotEmpty(productBoms)){
                    ProductBom productBom = productBoms.get(0);
                    // 获取bom子表信息
                    List<ProductStructure> productStructures = productStructureMapper.selectList(new LambdaQueryWrapper<ProductStructure>()
                            .isNotNull(ProductStructure::getParentId)
                            .eq(ProductStructure::getBomId, productBom.getId()));
                    if(com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isNotEmpty(productStructures)){
                        productStructures.forEach(item ->{
                            ProductStructureRecord item1 = new ProductStructureRecord();
                            BeanUtils.copyProperties(item, item1);
                            item1.setProductOrderId(productOrder.getId());
                            item1.setDemandedQuantity(item.getUnitQuantity().add(productOrder.getQuantity()));
                            item1.setDemandedQuantity(item.getUnitQuantity().multiply(productOrder.getQuantity()));
                            item1.setBomId(Long.valueOf(productBom.getId()));
                            productStructureRecordMapper.insert(item1);
                        });
@@ -464,10 +466,10 @@
            productOrderMapper.delete(new LambdaQueryWrapper<ProductOrder>()
                    .in(ProductOrder::getSaleLedgerProductId, productIds));
            // 删除附件
            commonFileService.deleteByBusinessIds(productIds, FileNameType.PRODUCT_ORDER.getValue());
            commonFileService.deleteByBusinessIds(orderIds, FileNameType.PRODUCT_ORDER.getValue());
            // 删除生产订单-物料清单
            productStructureRecordMapper.delete(new LambdaQueryWrapper<ProductStructureRecord>()
                    .in(ProductStructureRecord::getProductOrderId, productIds));
                    .in(ProductStructureRecord::getProductOrderId, orderIds));
        }
    }
src/main/resources/mapper/procurementrecord/ReturnSaleProductMapper.xml
@@ -15,7 +15,7 @@
               slp.specification_model                                      as model,
               slp.unit                                      as unit,
               rsp.*,
               GREATEST(slp.quantity - COALESCE(rs.total_return_num, 0), 0) AS un_quantity,
               GREATEST(si.shipping_num - COALESCE(rs.total_return_num, 0), 0) AS un_quantity,
               COALESCE(rs.total_return_num, 0)                             AS total_return_num
        FROM return_sale_product rsp
                 LEFT JOIN return_management rm ON rm.id = rsp.return_management_id