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

guoyujie

2025-09-05 b0c60452329a61c32db74a1c7d7753d383d6310a

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

@@ -348,7 +348,8 @@
                }
                glassOptimizeMapper.addOptimizeDetail(objectMap2,projectId);
            }
            glassOptimizeMapper.updateProjectOptimizeStateMp(projectId,1);

            glassOptimizeMapper.updateProjectOptimize(projectId, 1, optimalResults);
            return true;
        } catch (Exception e) {
            e.printStackTrace();