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

chenlu

2025-07-25 307cd7a9860c804eddd56465f0423efb950337dc

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

@@ -222,6 +222,7 @@
                Map<String, String> data = JSON.parseObject(dataList.get(i).get("reportWorkQuantity"),
                        new TypeReference<Map<String, String>>() {
                        });
                dataList.get(i).put("reportWorkQuantityShow",dataList.get(i).get("reportWorkQuantity"));
                for (String key : clos.keySet()) {
                    if(data.get(key) != null){
                       Integer max = orderGlassDetailMapper