Merge remote-tracking branch 'origin/master'

于杰

2025-11-04 7cf8f8fc1abca63423c1fb4618363f8a9d283f9d

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

@@ -212,6 +212,7 @@
                 INNER JOIN pp.optimize_project AS op ON op.project_no = c.project_no
                 LEFT JOIN sd.ORDER o ON o.order_id = c.order_id
                 LEFT JOIN sd.order_detail od ON c.order_id = od.order_id
                 AND c.order_number = od.order_number
         WHERE
             c.project_no IS NOT NULL
           and c.project_no = #{projectNo}
@@ -251,7 +252,8 @@
                    INNER JOIN pp.optimize_project AS op ON op.project_no = c.project_no
                    LEFT JOIN pp.flow_card fc ON c.process_id = fc.process_id and fc.technology_number=c.technology_number
                    LEFT JOIN sd.ORDER o ON o.order_id = c.order_id
                    LEFT JOIN sd.order_detail od ON c.order_id = od.order_id
                    LEFT JOIN sd.order_detail od ON fc.order_id = od.order_id
                    AND fc.order_number = od.order_number
                    left join
                (select (@row_number := @row_number + 1) as id,process_id as process_id,technology_number as technology_number from (select process_id,technology_number from pp.flow_card tt where project_no =#{projectNo} group by process_id,technology_number) tt,(select @row_number := 0) as t) a
                on a.process_id=c.process_id and a.technology_number=c.technology_number
@@ -2106,6 +2108,18 @@
        WHERE
            project_no = #{projectId}
    </select>
    <select id="getProjectState" resultType="java.util.Map" parameterType="java.lang.String">
        SELECT
            project_no,
            project_name,
            state,
            tempering_state,
            optimize_state
        FROM
            pp.optimize_project
        WHERE
            project_no = #{projectNo}
    </select>


</mapper>