From 48bd9e20aa649145c9bf643e375c0cd86f7bb800 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 04 九月 2025 08:28:52 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
index 4eed915..ea8cf33 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
@@ -1711,7 +1711,10 @@
                     p.creater = a.Id
                     )))
         WHERE
-            ( p.state = 1 ) and p.tempering_state=0 and optimize_state=0 and p.project_no = #{projectNo}
+            ( p.state = 1 ) and
+#             p.tempering_state=0 and
+#             optimize_state=0 and
+            p.project_no = #{projectNo}
         ORDER BY
             p.create_time DESC,
             p.project_no

--
Gitblit v1.8.0