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

huang

2024-12-27 3c1f9d699497dcfc4b682502945a4ebee4c37e03

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

@@ -89,6 +89,28 @@
            f.order_number;
    </select>

    <!--工程信息流程卡-->
    <select id="getProcessCardMp">
        SELECT
            fc.process_id,
            fc.order_number,
            fc.quantity,
            CONCAT(fc.technology_number, '/', COUNT(fc.technology_number)) AS layer,
            so.project,
            CONCAT(sd.child_width, ' × ', sd.child_height) AS sizes
        FROM
            pp.flow_card AS fc
                INNER JOIN sd.order AS so ON fc.order_id = so.order_id
                INNER JOIN sd.order_glass_detail AS sd ON sd.order_id = so.order_id AND fc.order_id = sd.order_id
                        AND fc.order_number = sd.order_number
        WHERE
            fc.project_no = #{projectNo}
        GROUP BY
            fc.order_id,
            fc.technology_number,
            fc.order_number
    </select>

    <!--库存信息-->
    <select id="materialStoreMp">
        SELECT