guoyuji
2024-07-04 e5a8747b12c11bfcd45549425cfb20327f4ae646
修改查询订单明细方式
2个文件已修改
29 ■■■■ 已修改文件
north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java
@@ -34,12 +34,17 @@
    private Integer group;
    private LocalDate productionTime;
    private LocalDate createTime;
   @TableField(select = false,exist = false)
    private  Order order;
    //@TableField(select = false)
//   @ManyToOne(fetch = FetchType.LAZY)
    @TableField(select = false,exist = false)
    private OrderDetail  orderDetail;
    @TableField(select = false,exist = false)
    private Integer productId;
    @TableField(select = false,exist = false)
    private Double width;
    @TableField(select = false,exist = false)
    private Double height;
}
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
@@ -214,11 +214,7 @@
        //修改订单主表面积与周长以及重量
        orderMapper.updateOrderParameter(orderId);
        //查询订单小片表获取工艺传入小片工艺表
        //List<OrderGlassDetail> orderGlassDetails = orderGlassDetailMapper.selectOrderGlassDetail(orderId);
        /*List<OrderProcessDetail> orderProcessDetailList = getOrderProcessDetails(orderGlassDetails);
        //赋值订单工艺表
        orderProcessDetailMapper.insertOrderProcessDetail(orderProcessDetailList);*/
    }
    public static List<OrderProcessDetail> getOrderProcessDetails(List<OrderGlassDetail> orderGlassDetails) {
@@ -273,6 +269,20 @@
        Order order = orderMapper.selectOne(new QueryWrapper<Order>().eq("order_id",id));
        List<OrderDetail> orderDetails = orderDetailMapper.selectList(new QueryWrapper<OrderDetail>().eq("order_id",id));
        List<OrderOtherMoney> orderOtherMoneyList = orderOtherMoneyMapper.findById(id);
        orderDetails.forEach(orderDetail -> {
            List<OrderGlassDetail> orderGlassDetails = orderGlassDetailMapper.selectList(
                    new QueryWrapper<OrderGlassDetail>()
                            .eq("order_id",orderDetail.getOrderId())
                            .eq("order_number",orderDetail.getOrderNumber())
            );
            orderGlassDetails.forEach(orderGlassDetail -> {
                orderGlassDetail.setProductId(orderDetail.getProductId());
                orderGlassDetail.setWidth(orderDetail.getWidth());
                orderGlassDetail.setHeight(orderDetail.getHeight());
            });
            orderDetail.setOrderGlassDetails(orderGlassDetails);
        });
        Map<String,Object> map = new HashMap<>();
        map.put("order",order);
        map.put("orderDetails",orderDetails);