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

廖井涛

2025-11-24 46964bace341e98f238a0a3fd29f6adc643312c7

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

@@ -657,7 +657,10 @@
                }
            }
        }
        map.put("optimizeState", Integer.parseInt(stringObjectMap.get("optimize_state").toString()));
        map.put("data", dataList);
        map.put("project", glassOptimizeMapper.selectProjectCount(projectNo));
        map.put("grindingTrimming", glassOptimizeMapper.getGrindingTrimming(username));
        return map;
    }