修改优化数据保存位置，将数据更新到optimize_Detail和optimize_layout中，并将余料数据更新到optimize_offcut中...

于杰

2025-08-08 e46d3f53ed3f699be91c4c6d2409a19cff935b54

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

@@ -746,7 +746,7 @@
        from pp.optimize_project as p
                 left join pp.optimize_admin as a on p.creater = a.Id
        where (`p`.`state` > 0)
            and (tempering_state>0 or optimize_state>0)
#             and (tempering_state>0 or optimize_state>0)
            and DATE (`p`.`create_time`) BETWEEN #{startSelectTime} AND #{endSelectTime}
        <if test="optimizeProjectMange.projectNumber != null and optimizeProjectMange.projectNumber != ''">
            and p.project_no regexp #{optimizeProjectMange.projectNumber}
@@ -1232,6 +1232,7 @@
            y_axis,
            patch_state,
            mark_icon,
            isRotate,
            rack_no
            ) VALUES (
            #{projectId},
@@ -1249,6 +1250,7 @@
            #{glass.y},
            #{glass.patchState},
            #{glass.markIcon},
            #{glass.isRotate},
            #{glass.rackNo}
            );
        </foreach>
@@ -1341,6 +1343,28 @@
            now()
            );
        </foreach>
    </insert>
    <insert id="addOptimizeOffcut">
        INSERT INTO pp.optimize_offcut (
        project_no,
        stock_id,
        width,
        height,
        x_axis,
        y_axis,
        model,
        thickness
        ) VALUES (
        #{projectId},
        #{map.stockSort},
        #{map.width},
        #{map.height},
        #{map.x},
        #{map.y},
        #{glassType},
        #{glassThickness}

        )
    </insert>


@@ -1749,8 +1773,16 @@
        where
            project_no =#{projectNo}
    </select>


    <select id="getGlassInfo" resultType="java.util.Map">
        select
            project_no,
            glass_type,
            glass_thickness
        from
            pp.optimize_project
        where
            project_no = #{projectId}
    </select>


</mapper>