From 3c1f9d699497dcfc4b682502945a4ebee4c37e03 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期五, 27 十二月 2024 16:54:45 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/pp/Report.xml |    2 +-
 1 files changed, 1 insertions(+), 1 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 2cb890c..4aebb63 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -759,7 +759,7 @@
 
     <select id="productionScheduleMp">
         select a.order_number,
-               if(od.shape='' || ISNULL(od.shape),'鏅舰',if(od.shape = 1, '鏅舰', if(od.shape = 2, '寮傚舰', ''))) as shape,
+               if(a.shape='' || ISNULL(a.shape),'鏅舰',if(a.shape = 1, '鏅舰', if(a.shape = 2, '寮傚舰', ''))) as shape,
                a.product_name,
                b.child_width,
                b.child_height,

--
Gitblit v1.8.0