From 3760bb766253ea2b2291e00d7bc5147bdee9bb44 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 19 六月 2024 16:58:09 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/Report.xml b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
index a4d1b8b..0c4b357 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -225,7 +225,7 @@
o.project,
o.order_id,
o.batch,
- od.shape,
+ if(od.shape=1,'鏅舰',if(od.shape=2,'寮傚舰','')) as shape,
ogd.order_number,
ogd.technology_number,
ogd.process,
@@ -526,7 +526,7 @@
ogd.child_height as childHeight,
fc.quantity,
round( ogd.child_width * ogd.child_height * fc.quantity / 1000000, 2 ) as area,
- od.shape,
+ if(od.shape=1,'鏅舰',if(od.shape=2,'寮傚舰','')) as shape,
od.remarks
FROM
sd.ORDER AS o
@@ -614,7 +614,7 @@
<select id="productionScheduleMp">
select
a.order_number,
- a.shape,
+ if(od.shape=1,'鏅舰',if(od.shape=2,'寮傚舰','')) as shape,
a.product_name,
b.child_width,
b.child_height,
@@ -967,7 +967,7 @@
o.project,
o.order_id,
o.batch,
- od.shape,
+ if(od.shape=1,'鏅舰',if(od.shape=2,'寮傚舰','')) as shape,
ogd.order_number,
ogd.technology_number,
ogd.process,
@@ -1180,7 +1180,7 @@
rwd.order_number,
MAX( ogd.child_width ) as width,
MAX( ogd.child_height ) as height,
- od.shape,
+ if(od.shape=1,'鏅舰',if(od.shape=2,'寮傚舰','')) as shape,
sum( pd.thickness ) as thickness,
od.edging_type,
rwd.completed_quantity,
--
Gitblit v1.8.0