Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyujie

3 天以前 3d9e0ec1c1e457ed3fd2b334cf4c4dd66c10eead

 north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java

@@ -741,7 +741,11 @@
                    Map<String, Object> itemmap = new HashMap<>();

                    Integer sumQuantity = flowCardMapper.getSumQuantity(flowCard.getOrderId());
                    List<Map<String, Object>> details = flowCardMapper.getPrintCustomData(flowCard.getProcessId(), flowCard.getOrderNumber(), flowCard.getPrintQuantity());
                    Integer printQuantity = flowCard.getPrintQuantity();
                    if (printQuantity==null){
                        printQuantity=0;
                    }
                    List<Map<String, Object>> details = flowCardMapper.getPrintCustomData(flowCard.getProcessId(), flowCard.getOrderNumber(), printQuantity);

                    for (Map<String, Object> detail : details) {
                        detail.put("sumQuantity", sumQuantity);
@@ -1790,6 +1794,31 @@
        }
        return true;
    }

    public Map<String, Object> PrintProgressProcessCardSv(List<String> selectDate, List<String> columns) {
        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);
            }
        }
        Map<String, Object> map = new HashMap<>();
        //获取表格内容数据
        List<Map<String, String>> dataList = flowCardMapper.PrintProgressProcessCardData(startDate, endDate);
        //获取表头工序筛选数据
        List<Map<String, String>> uniqueList = flowCardMapper.OrderProcess();
        map.put("title", uniqueList);
        List<String> list = new ArrayList<>();
        list.add(startDate);
        list.add(endDate);
        map.put("selectDate",list);
        map.put("data",dataList );
        return map;
    }
}