Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2025-02-20 02430791c250d61bef654f62d76de9dfabe826c7

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

@@ -68,9 +68,10 @@
            d.shape ,
            op.process_cards ,
            d.product_name ,
            d.price,
            op.remark ,
            d.building_number ,
            round(((`g`.`child_width` + g.child_height) * 2 * `f`.`quantity`),2) as perimeter ,
            round(((`g`.`child_width`/ 1000 + g.child_height / 1000) * 2 * `f`.`quantity`),2) as perimeter ,
            round((`g`.`area` * `f`.`quantity`),4) AS area,
            f.technology_number ,
            g.glass_child ,
@@ -94,22 +95,21 @@
        SELECT
            fc.process_id,
            fc.order_number,
            fc.technology_number,
            fc.quantity,
            fc.layout_status,
            CONCAT(fc.technology_number, '/', COUNT(fc.technology_number)) AS layer,
            so.project,
            sd.child_width AS width,
            sd.child_height AS height
            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.order_number,
            fc.technology_number ;
            fc.technology_number,
            fc.order_number
    </select>

    <!--库存信息-->