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

廖井涛

2024-06-14 fb8ec3f6a555f8ca1d02b305b08088d07dd5e709

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

@@ -494,7 +494,7 @@
        where fc.process_id = #{processId}
          and fc.technology_number = #{technologyNumber}
        group by fc.process_id, fc.order_number
        order by fc.order_number
        order by IF(sort!=NULL||sort!='',sort,fc.order_number)
    </select>

    <select id="getProcessList">
@@ -545,15 +545,30 @@
        order by d.technology_number
    </select>

    <select id="selectPrintSetup">
        select id,
               print_type as printType,
               print_type_name as printTypeName,
               print_state as printState
        from pp.print_setup
    <select id="printFlowCardDetailsMp">
        SELECT fc.process_id,
               fc.order_number,
               fc.technology_number,
               ogd.glass_address,
               ogd.child_width,
               ogd.child_height,
               fc.quantity,
               ROUND(ogd.child_width * ogd.child_height * fc.quantity / 1000000, 2) as area
        FROM flow_card AS fc
                 LEFT JOIN sd.order_glass_detail AS ogd ON fc.order_id = ogd.order_id
            AND fc.order_number = ogd.order_number
            AND fc.technology_number = ogd.technology_number
        where fc.process_id = #{processId}
          and fc.technology_number = #{technologyNumber}
    </select>

    <update id="updatePrintSetup">
        update pp.print_setup set print_state=#{printState} where alias=#{alias}
    <update id="printSortMp">
        update flow_card
        set sort = #{sort}
        where process_id = #{processId}
          and order_number=#{orderNumber}
          and technology_number = #{technologyNumber}
    </update>


</mapper>