From 0bc7e73b3fc23c115b7f2010a0018c42bd403b1a Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 09 七月 2025 11:19:20 +0800
Subject: [PATCH] 流程卡打印按落架顺序倒序查询

---
 north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
index f3aca7b..adc2142 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/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

--
Gitblit v1.8.0