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

guoyujie

2025-07-09 7071e6b8b3f144b80463b2c99684d4187bc2b79a

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

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

@@ -784,6 +784,10 @@
          and position(fc.technology_number in #{technologyNumber})
        group by fc.process_id, fc.order_number
        <choose>
            <!-- 当 landingSequence != 1 且 flashback != 1 时，按 landing_sequence 倒序 -->
            <when test="landingSequence != 1 and flashback != 1">
                ORDER BY landing_sequence,fc.id desc
            </when>
            <!-- landingSequence != 1 时，优先按 landing_sequence 倒序 -->
            <when test="landingSequence != 1">
                ORDER BY landing_sequence DESC
@@ -1477,6 +1481,9 @@
          and position(fc.technology_number in #{technologyNumber})
        group by fc.process_id, fc.order_number, fc.technology_number
        <choose>
            <when test="landingSequence != 1 and flashback != 1">
                ORDER BY landing_sequence,fc.id desc
            </when>
            <!-- landingSequence != 1 时，优先按 landing_sequence 倒序 -->
            <when test="landingSequence != 1">
                ORDER BY landing_sequence DESC
@@ -1530,6 +1537,9 @@
        where fc.process_id = #{processId} and fc.`merge`=1
        group by fc.process_id, fc.order_number
        <choose>
            <when test="landingSequence != 1 and flashback != 1">
                ORDER BY landing_sequence,fc.id desc
            </when>
            <!-- landingSequence != 1 时，优先按 landing_sequence 倒序 -->
            <when test="landingSequence != 1">
                ORDER BY landing_sequence DESC
@@ -3221,6 +3231,9 @@
        and position(fc.technology_number in #{compound})
        group by fc.process_id, fc.order_number
        <choose>
            <when test="landingSequence != 1 and flashback != 1">
                ORDER BY landing_sequence,fc.id desc
            </when>
            <!-- landingSequence != 1 时，优先按 landing_sequence 倒序 -->
            <when test="landingSequence != 1">
                ORDER BY landing_sequence DESC
@@ -3274,6 +3287,9 @@
        and position(fc.technology_number in #{compound})
        group by fc.process_id, fc.order_number
        <choose>
            <when test="landingSequence != 1 and flashback != 1">
                ORDER BY landing_sequence,fc.id desc
            </when>
            <!-- landingSequence != 1 时，优先按 landing_sequence 倒序 -->
            <when test="landingSequence != 1">
                ORDER BY landing_sequence DESC

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

@@ -1969,7 +1969,7 @@
        LEFT JOIN
        pp.reporting_work as rwk
        on rw.reporting_work_id = rwk.reporting_work_id
        where  position(rwk.this_process in #{selectProcesses})
        where  position(#{selectProcesses} in rwk.this_process  )
        and rwk.this_process!='切割'
        and rw.review_status >= 0
        GROUP BY rw.process_id, rw.order_sort, rw.technology_number) as c