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

guoyujie

2025-07-08 7104751e2f26872d4891d01d42ee88cf19715d01

 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 时，优先按 landing_sequence 倒序 -->
            <when test="landingSequence != 1">
                ORDER BY landing_sequence DESC
            </when>
            <!-- flashback = 1 时正序 -->
            <when test="flashback == 1">
                ORDER BY
@@ -1473,6 +1477,10 @@
          and position(fc.technology_number in #{technologyNumber})
        group by fc.process_id, fc.order_number, fc.technology_number
        <choose>
            <!-- landingSequence != 1 时，优先按 landing_sequence 倒序 -->
            <when test="landingSequence != 1">
                ORDER BY landing_sequence DESC
            </when>
            <!-- flashback = 1 时正序 -->
            <when test="flashback == 1">
                ORDER BY
@@ -1522,6 +1530,10 @@
        where fc.process_id = #{processId} and fc.`merge`=1
        group by fc.process_id, fc.order_number
        <choose>
            <!-- landingSequence != 1 时，优先按 landing_sequence 倒序 -->
            <when test="landingSequence != 1">
                ORDER BY landing_sequence DESC
            </when>
            <!-- flashback = 1 时正序 -->
            <when test="flashback == 1">
                ORDER BY
@@ -2422,7 +2434,13 @@
               JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01'))                  AS glassNumber,
               od.order_number,
               ogd.child_width as width,
               ogd.child_height as height
               ogd.child_height as height,
                ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') AS glassNumber,
                JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS S01,
                JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')) AS S02,
                JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S03')) AS S03,
                JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04')) AS S04,
                JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S05')) AS S05
        from flow_card as fc
                 left join sd.order_glass_detail as ogd
                           on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number and
@@ -3203,6 +3221,10 @@
        and position(fc.technology_number in #{compound})
        group by fc.process_id, fc.order_number
        <choose>
            <!-- landingSequence != 1 时，优先按 landing_sequence 倒序 -->
            <when test="landingSequence != 1">
                ORDER BY landing_sequence DESC
            </when>
            <!-- flashback = 1 时正序 -->
            <when test="flashback == 1">
                ORDER BY
@@ -3252,6 +3274,10 @@
        and position(fc.technology_number in #{compound})
        group by fc.process_id, fc.order_number
        <choose>
            <!-- landingSequence != 1 时，优先按 landing_sequence 倒序 -->
            <when test="landingSequence != 1">
                ORDER BY landing_sequence DESC
            </when>
            <!-- flashback = 1 时正序 -->
            <when test="flashback == 1">
                ORDER BY