blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
廖井涛
2025-08-06 547294b0c7a7de8cc84a8a8df297548c7b2f9846 
 north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml


@@ -243,7 +243,7 @@


    <select id="getOptimizeDetail">


        SELECT


            h.project_no,


            h.heat_layout_id as rackNo,


            h.rack_no as rackNo,


            h.o_width AS width,


            h.o_height AS height,


            (h.height-h.o_height)/2 as shortGrind1,


@@ -280,14 +280,14 @@


            h.project_no =#{projectNo}


        GROUP BY


            h.project_no,


            h.heat_layout_id,


            h.rack_no,


            h.width,


            h.height,


            h.process_id,


            h.layer,


            c.order_number


        ORDER BY


            h.heat_layout_id;


            h.rack_no;


    </select>




    <!--工程信息流程卡-->


@@ -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


@@ -1117,7 +1118,8 @@


            x_axis,


            y_axis,


            patch_state,


            mark_icon


            mark_icon,


            rack_no


            ) VALUES (


            #{projectId},


            #{glass.processId},


@@ -1133,7 +1135,8 @@


            #{glass.x},


            #{glass.y},


            #{glass.patchState},


            #{glass.markIcon}


            #{glass.markIcon},


            #{glass.rackNo}


            );


        </foreach>


    </insert>


@@ -1360,7 +1363,7 @@


               数量 as quantity,


               形状 as shape,


               项目 as project,


               单片名称 as glass_child,


               产品名称 as glass_child,


               面积 as area,


               GlassType as glassType,


               patch_state


@@ -1468,6 +1471,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