Merge remote-tracking branch 'origin/master'

于杰

2025-11-04 7cf8f8fc1abca63423c1fb4618363f8a9d283f9d

 north-glass-erp/src/main/resources/mapper/sd/BomDataMapper.xml

@@ -65,4 +65,27 @@
        GROUP BY bb.material_id
        ORDER BY bp.product_layer
    </select>

    <select id="getEditProductBOMSv">
        SELECT
            bp.product_layer,
            bb.material_id,
            bb.material,
            JSON_UNQUOTE(
                    JSON_EXTRACT( ms.json, '$.thickness' )) AS thickness,
            JSON_UNQUOTE(
                    JSON_EXTRACT( ms.json, '$.width' )) AS width,
            JSON_UNQUOTE(
                    JSON_EXTRACT( ms.json, '$.height' )) AS height,
            JSON_UNQUOTE(
                    JSON_EXTRACT( ms.json, '$.unit' )) AS unit,
            bb.consume,
            bb.price
        FROM
            bom_product AS bp
                LEFT JOIN bom_base AS bb ON bb.id = bp.base_id
                LEFT JOIN mm.material_store AS ms ON ms.id = bb.material_id
        WHERE
            bp.product_id = #{produceId}
    </select>
</mapper>