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

chenlu

2025-07-30 e9f8d23f55f64903d834308f9f167aaf3195c20d

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

@@ -545,7 +545,7 @@
               数量 as quantity,
               形状 as shape,
               项目 as project,
               单片名称 as glass_child,
               产品名称 as glass_child,
               面积 as area,
               GlassType as glassType,
               patch_state
@@ -561,7 +561,7 @@
               数量 as quantity,
               形状 as shape,
               项目 as project,
               单片名称 as glass_child,
               产品名称 as glass_child,
               面积 as area,
               GlassType as glassType,
               patch_state
@@ -577,7 +577,7 @@
               数量 as quantity,
               形状 as shape,
               项目 as project,
               单片名称 as glass_child,
               产品名称 as glass_child,
               面积 as area,
               GlassType as glassType,
               patch_state
@@ -727,7 +727,8 @@
            p.remark,
            a.name,
            p.create_time,
            p.update_time
            p.update_time,
            p.optimize_state
        FROM
            (
                pp.optimize_project p
@@ -1360,7 +1361,7 @@
               数量 as quantity,
               形状 as shape,
               项目 as project,
               单片名称 as glass_child,
               产品名称 as glass_child,
               面积 as area,
               GlassType as glassType,
               patch_state
@@ -1468,6 +1469,37 @@
            fc.layer,
            fc.order_number
    </select>
    <select id="getProjectByProjectNoSv" resultType="java.util.Map">
        SELECT
            p.id,
            p.project_no as projectNumber,
            p.project_name,
            p.glass_type,
            p.glass_thickness,
            p.type,
            p.state,
            p.glass_total as quantity,
            p.glass_total_area,
            p.process_qty,
            p.process_cards,
            p.remark,
            a.name,
            p.create_time,
            p.update_time,
            p.optimize_state
        FROM
            (
                pp.optimize_project p
                    LEFT JOIN pp.optimize_admin a ON ((
                    p.creater = a.Id
                    )))
        WHERE
            ( p.state = 1 ) and p.tempering_state=0 and optimize_state=0 and p.project_no = #{projectNo}
        ORDER BY
            p.create_time DESC,
            p.project_no

    </select>

    <delete id="deleteOptimizeDetailThirdParty">
        delete from pp.other_flow_card