提交空闲位置

guoyuji

2024-07-01 ad4e0e5444d2f4f6a4df45742a146428d646d02e

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

@@ -237,8 +237,8 @@

                    //对循环明细的数据进行累加
                    quantity += orderDetail.getDeliveryDetail().getQuantity();
                    area += orderDetail.getFinishedGoodsInventory().getActualSignalArea() * orderDetail.getDeliveryDetail().getQuantity();
                    money += orderDetail.getPrice() * orderDetail.getDeliveryDetail().getQuantity();
                    area += orderDetail.getComputeArea() * orderDetail.getDeliveryDetail().getQuantity();
                    money += deliveryDetailMoney;
                    Integer deliveryDetailmaximum = deliveryDetailMapper.getdeliveryDetailmaximum(oddNumber);

                    //额外金额修改
@@ -366,6 +366,29 @@

    }

    public Map<String, Object> getSelectOrderPrinting(OrderDetail orderDetail) {
        Map<String, Object> map = new HashMap<>();
        List <Map<String, Object>> list=new ArrayList<Map<String, Object>>();//最终结果
        List<OrderDetail> orderDetailList=deliveryDetailMapper.getSelectOrderPrinting(orderDetail);
        for (OrderDetail detail : orderDetailList) {

            Map<String, Object> itemmap = new HashMap<>();
            List<Map<String, Object>> deliveryDetailList2 = deliveryDetailMapper.getSelectOrderDetailPrinting(
                    detail.getProductId(), detail.getOrderId());
            itemmap.put("DeliveryDetail", detail);
            itemmap.put("DeliveryDetailList", deliveryDetailList2);
            list.add(itemmap);


        }
        Order order=deliveryMapper.getSelectShippingOrderDetailPrinting(orderDetail);
        map.put("data", list);
        map.put("delivery", deliveryMapper.getSelectShippingOrderDetailPrinting(orderDetail));
        map.put("money", toChinese(order.getMoney().toString(), false));
        return map;

    }

    public List<DeliveryDetailDTO> exportDeliveryDetailReport(List<LocalDate> dates) {
        return deliveryDetailMapper.exportDeliveryDetailReport(dates);
    }