Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyuji

2024-07-09 d7a52156c1e3d1eb2d85d582ab26133ae2895fa8

 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java

@@ -514,6 +514,56 @@
        return returns;
    }

    public Object printOrderProductGlassDetailMonolithic(String orderId,List<String> productId) {
        List<Map<String,Object>> orderProductDistinct;
        if (productId.size()>0){
            orderProductDistinct = orderDetailMapper.getOrderProductDistinctByIds(orderId,productId);
        }else{
            orderProductDistinct = orderDetailMapper.getOrderProductDistinctById(orderId);
        }

        Map<String,Object> returns = new HashMap<>();
        returns.put("order",orderMapper.selectOne(new QueryWrapper<Order>().eq("order_id",orderId)));

        List<Map<String,Object>> orderProductDetail = new ArrayList<>();

        orderProductDistinct.forEach(map->{
            Map<String,Object> orderProductDetailMap = new HashMap<>();
            orderProductDetailMap.put("productId",map.get("productId"));
            orderProductDetailMap.put("productName",map.get("productName"));
            List<Map<String,Object>> orderDetails = orderDetailMapper.getOrderProductByProductIds(map.get("productId"),orderId);
            List<Map<String,Object>> orderProductDetail1 = new ArrayList<>();

            for(Map<String,Object> objectMap:orderDetails){
                Map<String,Object> orderProductDetailMap1 = new HashMap<>();
                orderProductDetailMap1.put("detail",objectMap.get("detail").toString());
                List<Map<String,Object>> orderGlassDetails =orderGlassDetailMapper.getOrderGlassDetailByProductId(objectMap.get("order_id").toString(),
                        objectMap.get("detail").toString(), Long.valueOf(objectMap.get("product_id").toString()));
                orderProductDetailMap1.put("orderGlassDetails",orderGlassDetails);
                orderProductDetail1.add(orderProductDetailMap1);
            }

            /*orderDetails.forEach(orderDetail->{
                List<OrderGlassDetail> glassChildList=orderGlassDetailMapper.getOrderGlassDetailByProductIdGlassChild(orderDetail.getOrderId(),orderDetail.getOrderNumber());

                for (OrderGlassDetail glassChildLists:glassChildList){
                    orderProductDetailMap1.put("glassChild",glassChildLists.getGlassChild());
                    List<OrderGlassDetail> orderGlassDetails =orderGlassDetailMapper.getOrderGlassDetailByProductId(orderDetail.getOrderId(),orderDetail.getOrderNumber(),glassChildLists.getGlassChild());
                    Integer differentSize = orderGlassDetailMapper.getDifferentSizeNumber(orderId,orderDetail.getOrderNumber());
                    orderDetail.setDifferentSize(differentSize);
                    orderDetail.setOrderGlassDetails(orderGlassDetails);
                    orderProductDetailMap1.put("orderGlassDetail",orderGlassDetails);
                }
                orderProductDetail1.add(orderProductDetailMap1);

            });*/
            orderProductDetailMap.put("productDetail",orderProductDetail1);
            orderProductDetail.add(orderProductDetailMap);
        });
        returns.put("orderDetail",orderProductDetail);
        return returns;
    }

    public Object printOrderProductGlassDetail(String orderId) {
        Map<String,Object> returns = new HashMap<>();
        returns.put("order",orderMapper.selectOne(new QueryWrapper<Order>().eq("order_id",orderId)));