Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

chenlu

2024-04-18 c3e3920e4e7fcda3dd986c00bb80188381e93015

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

@@ -63,6 +63,29 @@
        return map;
    }

    public Map<String, Object> getSelectDeliveryDetailReport(Integer pageNum, Integer pageSize,List<String> selectDate, DeliveryDetail deliveryDetail) {
        Integer offset = (pageNum - 1) * pageSize;
        String endDate = LocalDate.now().toString();
        String startDate = LocalDate.now().minusDays(15).toString();
        if(selectDate !=null && selectDate.size()==2){
            if(!selectDate.get(0).isEmpty()){
                startDate = selectDate.get(0);
            }
            if(!selectDate.get(1).isEmpty()){
                endDate = selectDate.get(1);
            }
        }
        System.out.println(pageSize);
        Map<String, Object> map = new HashMap<>();
        map.put("data", deliveryDetailMapper.getSelectDeliveryDetailReport(offset, pageSize,startDate,endDate, deliveryDetail));
        map.put("total", deliveryDetailMapper.getSelectDeliveryDetailReportPageTotal(offset, pageSize,startDate,endDate, deliveryDetail));
        List<String> list = new ArrayList<>();
        list.add(startDate);
        list.add(endDate);
        map.put("selectDate",list);
        return map;
    }

    public Map<String, Object> getSelectShippingOrderDetail(Integer pageNum, Integer pageSize, OrderDetail orderDetail) {
        Integer offset = (pageNum - 1) * pageSize;

@@ -242,6 +265,29 @@

    }

    public Map<String, Object> getSelectDeliveryPrinting( DeliveryDetail deliveryDetail) {
        Map<String, Object> map = new HashMap<>();
        List <Map<String, Object>> list=new ArrayList<Map<String, Object>>();//最终结果
        System.out.println(deliveryDetail);
        List<DeliveryDetail> deliveryDetailList=deliveryDetailMapper.getSelectDeliveryPrinting(deliveryDetail);
        for (int i = 0; i < deliveryDetailList.size(); i++) {

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

            List <Map<String, Object>> deliveryDetailList2=deliveryDetailMapper.getSelectDeliveryDetailPrinting(deliveryDetailList.get(i).getDeliveryId(),
                    deliveryDetailList.get(i).getOrderDetail().getProductId(),deliveryDetailList.get(i).getOrderDetail().getOrderId());
            itemmap.put("DeliveryDetail",deliveryDetailList.get(i));
            itemmap.put("DeliveryDetailList",deliveryDetailList2);
            list.add(itemmap);


        }
        map.put("data", list);
        map.put("delivery", deliveryMapper.getSelectShippingOrderDetailDeliveryPrinting(deliveryDetail));
        return map;

    }


    public String orderNumberSetting(String type) {
        //根据类型自动生成不同的操作单号