blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
廖井涛
2024-07-01 50efd9f19463da742e8c7b751bb4ab2c97acbf61 
 north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java


@@ -19,6 +19,7 @@


import org.springframework.transaction.annotation.Transactional;


import org.springframework.transaction.interceptor.TransactionAspectSupport;




import java.lang.reflect.Field;


import java.text.SimpleDateFormat;


import java.time.LocalDate;


import java.util.*;


@@ -237,8 +238,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);




                    //额外金额修改


@@ -343,23 +344,38 @@




    }




    public Map<String, Object> getSelectDeliveryPrinting( DeliveryDetail deliveryDetail) {


    public Map<String, Object> getSelectDeliveryPrinting( DeliveryDetail deliveryDetail) throws IllegalAccessException {


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


        List <Map<String, Object>> list=new ArrayList<Map<String, Object>>();//最终结果


        List <Map<String, Object>> moneryList=new ArrayList<Map<String, Object>>();//最终结果


        List<DeliveryDetail> deliveryDetailList=deliveryDetailMapper.getSelectDeliveryPrinting(deliveryDetail);


        String orderId="";


        for (DeliveryDetail detail : deliveryDetailList) {




            orderId=detail.getOrderDetail().getOrderId();


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




            List<Map<String, Object>> deliveryDetailList2 = deliveryDetailMapper.getSelectDeliveryDetailPrinting(detail.getDeliveryId(),


                    detail.getOrderDetail().getProductId(), detail.getOrderDetail().getOrderId());


            for (Map<String, Object> stringObjectMap : deliveryDetailList2) {


                if(stringObjectMap.get("other_columns")!=null){


                    JSONObject jsonObject = JSON.parseObject(stringObjectMap.get("other_columns").toString());


                    for(String key : jsonObject.keySet()){


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


                        List<Map<String, Object>> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectotherMoney(detail.getOrderDetail().getOrderId(),detail.getDeliveryId(),key,jsonObject.get(key).toString());


                        moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);


                        moneryList.add(moneryItemmap);


                    }




                }


            }


            itemmap.put("DeliveryDetail", detail);


            itemmap.put("DeliveryDetailList", deliveryDetailList2);


            list.add(itemmap);






        }


        Delivery delivery=deliveryMapper.getSelectShippingOrderDetailDeliveryPrinting(deliveryDetail);


        map.put("data", list);


        map.put("otherMoney",moneryList);


        map.put("delivery", deliveryMapper.getSelectShippingOrderDetailDeliveryPrinting(deliveryDetail));


        map.put("money", toChinese(delivery.getMoney().toString(), false));


        return map;