blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
guoyujie
2025-06-21 2e2356dd4fec268f6be6ed923b14bfa667de0c0d 
 north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java


@@ -47,8 +47,9 @@


    private final ProductDetailMapper productDetailMapper;




    private final OrderDetailMapper orderDetailMapper;


    private final OrderMapper orderMapper;




    public FlowCardService(FlowCardMapper flowCardMapper, OrderGlassDetailMapper orderGlassDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper, LogService logService, ProductMapper productMapper, ProductDetailMapper productDetailMapper, OrderDetailMapper orderDetailMapper) {


    public FlowCardService(FlowCardMapper flowCardMapper, OrderGlassDetailMapper orderGlassDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper, LogService logService, ProductMapper productMapper, ProductDetailMapper productDetailMapper, OrderDetailMapper orderDetailMapper, OrderMapper orderMapper) {


        this.flowCardMapper = flowCardMapper;


        this.orderGlassDetailMapper = orderGlassDetailMapper;


        this.orderProcessDetailMapper = orderProcessDetailMapper;


@@ -56,6 +57,7 @@


        this.productMapper = productMapper;


        this.productDetailMapper = productDetailMapper;


        this.orderDetailMapper = orderDetailMapper;


        this.orderMapper = orderMapper;


    }




    //流程卡管理查询


@@ -1007,11 +1009,15 @@


                )


        );




        Order order = orderMapper.


                selectOne(new QueryWrapper<Order>()


                        .eq("order_id", flowCardList.get(0).getOrderId()));


        order.setMoney(null);




        Map<String,Object> map = new HashMap<>();


        map.put("product",product);


        map.put("flowCard",flowCardList);




        map.put("order",order);






        return map;