产品供销存-后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
liyong
2026-04-25 80155f95799dfd1c457e32252cbe43dfbb01c05a 
 src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java


@@ -17,9 +17,11 @@


import com.ruoyi.production.service.ProductOrderService;


import com.ruoyi.production.service.ProductProcessService;


import com.ruoyi.production.service.ProductWorkOrderService;


import com.ruoyi.production.service.ProductionPrintOrderService;


import com.ruoyi.quality.mapper.QualityInspectMapper;


import lombok.RequiredArgsConstructor;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.context.annotation.Lazy;


import org.springframework.stereotype.Service;




import java.math.BigDecimal;


@@ -29,6 +31,7 @@


import java.util.HashMap;


import java.util.List;


import java.util.Map;


import java.util.function.Function;


import java.util.stream.Collectors;




@Service


@@ -37,6 +40,10 @@




    private final ProductWorkOrderService productWorkOrderService;


    private final ProductProcessService productProcessService;




    @Autowired


    @Lazy


    private ProductionPrintOrderService  productionPrintOrderService;


    @Autowired


    private ProductOrderMapper productOrderMapper;


    @Autowired


@@ -64,7 +71,23 @@




    @Override


    public IPage<ProductOrderDto> pageProductOrder(Page page, ProductOrderDto productOrder) {


        return productOrderMapper.pageProductOrder(page, productOrder);


        IPage<ProductOrderDto> productOrderDtoIPage = productOrderMapper.pageProductOrder(page, productOrder);


        // 填充印刷单信息


        List<ProductOrderDto> records = productOrderDtoIPage.getRecords();


        if (CollUtil.isNotEmpty(records)) {


            List<Long> orderIds = records.stream().map(ProductOrderDto::getId).collect(Collectors.toList());


            Map<Long, ProductionPrintOrder> collect = productionPrintOrderService.getListByOrders(orderIds).stream().collect(Collectors.toMap(ProductionPrintOrder::getProductOrderId, Function.identity()));


            records.forEach(record -> {


                ProductionPrintOrder productionPrintOrder = collect.get(record.getId());


                if (productionPrintOrder != null) {


                    productionPrintOrder.convertProductOrderDto(record);


                }


            });






        }




        return productOrderDtoIPage;


    }




    @Override