From ba4f03556d24a1548de75c8219cbc3f06e4ff57c Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期一, 11 八月 2025 16:31:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml |    2 +-
 1 files changed, 1 insertions(+), 1 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 e94dab6..74d56c9 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -3423,7 +3423,7 @@
                od.processing_note                                    as processingNote,
                ogd.child_width                                as width,
                ogd.child_height                              as height,
-               #{printQuantity} as quantity,
+               fc.quantity,
                CONCAT(ogd.child_width  , ' X ', ogd.child_height   ,' = ',fc.quantity )           as size,
                od.order_number                                       as orderNumber,
                fc.technology_number                                  as technologyNumber,

--
Gitblit v1.8.0