From a8378db2feef3b08edc0a6594bec187051d3b754 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 十二月 2025 13:32:33 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 9 +++++----
1 files changed, 5 insertions(+), 4 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 952fb3c..92c10e2 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -1156,19 +1156,19 @@
od.processing_note as processingNote,
width,
height,
- #{printQuantity} as quantity,
+ if(#{printQuantity}>0 ,#{printQuantity},fc.quantity) as quantity,
CONCAT(
TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width AS CHAR))),
' X ',
TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height AS CHAR))),
- ' = ',#{printQuantity} ) as size,
+ ' = ',if(#{printQuantity}>0 ,#{printQuantity},fc.quantity) ) as size,
CONCAT(
od.order_number,') ',
TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width AS CHAR))),
' X ',
TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(height AS CHAR))),
- ' = ',#{printQuantity} ) as numberSize,
+ ' = ',if(#{printQuantity}>0 ,#{printQuantity},fc.quantity) ) as numberSize,
CONCAT(
od.order_number,')',' ',
TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(width AS CHAR))),
@@ -3979,7 +3979,8 @@
c.print_status,
c.print_number,
o.project,
- o.customer_name
+ o.customer_name,
+ b.process
from pp.flow_card as c
left join
--
Gitblit v1.8.0