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

guoyujie

2025-08-08 9cf6783836fcee8afd5519b7bde82e10eadec4df

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

@@ -775,6 +775,10 @@
        Map<String, Object> map = new HashMap<>();
        //获取表格内容数据
        List<Map<String, String>> dataList = reportMapper.processCardProgressCollectMp(orderId);
        //获取表头工序筛选数据
        List<Map<String, String>> uniqueList = orderProcessDetailMapper.filterOrderProcess(orderId);

        map.put("title", uniqueList);
        return  null;
    }
}