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

guoyujie

2025-08-11 e51e45f2cabcc4628ce93e55c7c3806b1b760161

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

@@ -1224,8 +1224,8 @@
            order_sort,
            stock_id,
            polys_id,
            o_width,
            o_height,
            p_width,
            p_height,
            width,
            height,
            x_axis,
@@ -1287,6 +1287,7 @@
            down_trim,
            left_trim,
            right_trim,
            count,
            glass_count,
            glass_area,
            create_time
@@ -1301,7 +1302,8 @@
            #{glass.downTrim},
            #{glass.leftTrim},
            #{glass.rightTrim},
            #{glass.glassCount},
            #{glass.count},
            #{glass.glassQuantity},
            #{glass.glassArea},
            now()
            );
@@ -1659,6 +1661,13 @@
        delete from pp.other_flow_card
        where project_no = #{projectNumber}
    </delete>
    <delete id="deleteOptimizeOffcut">
        DELETE
        FROM
            pp.optimize_offcut
        WHERE
            project_no = #{projectNumber}
    </delete>


    <select id="selectOptimizeProject">
@@ -1783,6 +1792,65 @@
        where
            project_no = #{projectId}
    </select>
    <select id="getOptimizeLayoutsInfo" resultType="java.util.Map">
        SELECT
            width,
            height,
            stock_id AS stockId,
            stock_code AS stockCode,
            usage_rate AS usageRate,
            up_trim AS upTrim,
            down_trim AS downTrim,
            left_trim AS leftTrim,
            right_trim AS rightTrim,
            count AS quantity,
            glass_count AS glassQuantity
        FROM
            pp.optimize_layout
        where
            project_no = #{projectId}
    </select>
    <select id="getOptimizeDetailsInfo" resultType="java.util.Map">
        SELECT
            0 As isRemain,
            width AS realWidth,
            height AS realHeight,
            p_width AS width,
            p_height AS height,
            process_id AS processId,
            layer,
            total_layer AS totalLayer,
            order_sort As orderSort,
            stock_id AS layoutId,
            stock_number AS glassSort,
            x_axis AS x,
            y_axis AS y,
            mark_icon AS markIcon,
            isRotate,
            rack_no As rackNo
        FROM
            pp.optimize_detail
        WHERE
            project_no = #{projectId}
    </select>
    <select id="getOptimizeOffsetsInfo" resultType="java.util.Map">
        SELECT
            1 AS isRemain,
            0 AS isRotate,
            width AS realWidth,
            height AS realHeight,
            width AS width,
            height AS height,
            stock_id AS stockSort,
            x_axis AS x,
            y_axis AS y,
            model AS glassType,
            thickness AS glassThickness
        FROM
            pp.optimize_offcut
        WHERE
            project_no = #{projectId}
    </select>


</mapper>