Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2024-09-25 b5a9dccccaf5bed064891a05ec8ff3f21de9cff0

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

@@ -886,4 +886,32 @@
        where reporting_work_id=#{reportingWorkId} and order_number = #{orderSort}
          and technology_number = #{technologyNumber}
    </update>

    <select id="selectUserProcess">
        select address from erp_user_info.user where login_name=#{userId}
    </select>

    <select id="getSelectProcessJiajiao">
        SELECT * FROM (
                          SELECT * FROM sd.basic_data
                          WHERE basic_type='product' AND basic_category='process' AND basic_name='夹胶'

                          UNION

                          SELECT * FROM sd.basic_data
                          WHERE basic_type='product' AND basic_category='process' AND basic_name='均质'
                      ) AS combined_results;
    </select>

    <select id="getSelectProcessDuoqu">
        SELECT * FROM (
                          SELECT * FROM sd.basic_data
                          WHERE basic_type='product' AND basic_category='process' AND basic_name='技术部多曲'

                          UNION

                          SELECT * FROM sd.basic_data
                          WHERE basic_type='product' AND basic_category='process' AND basic_name='钢化'
                      ) AS combined_results;
    </select>
</mapper>