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

廖井涛

2025-08-11 b499a7e1dbcc4b9dbcdcaa46bbf5c24271bf6698

 north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml

@@ -1233,6 +1233,7 @@
            patch_state,
            mark_icon,
            isRotate,
            glass_point,
            rack_no
            ) VALUES (
            #{projectId},
@@ -1251,6 +1252,7 @@
            #{glass.patchState},
            #{glass.markIcon},
            #{glass.isRotate},
            #{glass.glassPoint},
            #{glass.rackNo}
            );
        </foreach>
@@ -1827,6 +1829,7 @@
            y_axis AS y,
            mark_icon AS markIcon,
            isRotate,
            glass_point AS glassPoint,
            rack_no As rackNo
        FROM
            pp.optimize_detail