提交 标记内外添加配置文件

guoyujie

2025-10-15 faaf48208ab4331a65b013ee5cf5e915936029eb

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

@@ -1365,8 +1365,8 @@
            #{projectId},
            #{glass.stockCode},
                      1,
            #{glass.width},
            #{glass.height},
            #{glass.width}+#{glass.leftTrim}+#{glass.rightTrim},
            #{glass.height}+#{glass.downTrim}+#{glass.upTrim},
            #{glass.count},
            #{glass.count},
                      1,
@@ -1980,11 +1980,9 @@
            ou.use_count AS quantity,
            ou.width,
            ou.height,
            ou.width*ou.height*ou.use_count/1000000.0 as useArea,
            op.glass_total_area as totalArea
            ou.width*ou.height*ou.use_count/1000000.0 as useArea
        FROM
            pp.optimize_use ou
                INNER JOIN pp.optimize_project op on ou.project_no = op.project_no
        WHERE
            ou.project_no = #{processId} and ou.state=1
    </select>
@@ -2050,6 +2048,17 @@
        from pp.optimize_use ou
                 left join mm.material_store ms on ou.raw_stock_code=ms.id where project_no=#{projectNumber} and state=1
    </select>
    <select id="getLayoutSetSv" resultType="java.util.Map">
        SELECT
            project_no,
            width,height,
            usage_rate,
            stock_code
        FROM
            pp.optimize_layout
        WHERE
            project_no = #{processId}
    </select>


</mapper>