From 5545a0d9d5a33592591ba2089d4c095356bdba09 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 25 六月 2024 10:58:58 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 4 ++--
1 files changed, 2 insertions(+), 2 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 b7cef34..3fad827 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -637,8 +637,8 @@
od.order_number = fc.order_number
where fc.process_id = #{processId}
and fc.technology_number=#{technologyNumber}
- group by od.order_number,width,height
-
+ group by od.order_number,width,height
+ order by IF(fc.sort!=NULL||fc.sort!='',fc.sort,fc.order_number)
</select>
<select id="getPrintLabelCount">
--
Gitblit v1.8.0