From 6d390204f55d6bbb6f9eb7a97a9ebf48bfd2c2fd Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 04 八月 2025 13:24:28 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 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 aefcab9..70f2b4a 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
@@ -545,7 +545,7 @@
鏁伴噺 as quantity,
褰㈢姸 as shape,
椤圭洰 as project,
- 鍗曠墖鍚嶇О as glass_child,
+ 浜у搧鍚嶇О as glass_child,
闈㈢Н as area,
GlassType as glassType,
patch_state
@@ -561,7 +561,7 @@
鏁伴噺 as quantity,
褰㈢姸 as shape,
椤圭洰 as project,
- 鍗曠墖鍚嶇О as glass_child,
+ 浜у搧鍚嶇О as glass_child,
闈㈢Н as area,
GlassType as glassType,
patch_state
@@ -577,7 +577,7 @@
鏁伴噺 as quantity,
褰㈢姸 as shape,
椤圭洰 as project,
- 鍗曠墖鍚嶇О as glass_child,
+ 浜у搧鍚嶇О as glass_child,
闈㈢Н as area,
GlassType as glassType,
patch_state
@@ -727,7 +727,8 @@
p.remark,
a.name,
p.create_time,
- p.update_time
+ p.update_time,
+ p.optimize_state
FROM
(
pp.optimize_project p
@@ -1360,7 +1361,7 @@
鏁伴噺 as quantity,
褰㈢姸 as shape,
椤圭洰 as project,
- 鍗曠墖鍚嶇О as glass_child,
+ 浜у搧鍚嶇О as glass_child,
闈㈢Н as area,
GlassType as glassType,
patch_state
@@ -1468,6 +1469,37 @@
fc.layer,
fc.order_number
</select>
+ <select id="getProjectByProjectNoSv" resultType="java.util.Map">
+ SELECT
+ p.id,
+ p.project_no as projectNumber,
+ p.project_name,
+ p.glass_type,
+ p.glass_thickness,
+ p.type,
+ p.state,
+ p.glass_total as quantity,
+ p.glass_total_area,
+ p.process_qty,
+ p.process_cards,
+ p.remark,
+ a.name,
+ p.create_time,
+ p.update_time,
+ p.optimize_state
+ FROM
+ (
+ pp.optimize_project p
+ LEFT JOIN pp.optimize_admin a ON ((
+ p.creater = a.Id
+ )))
+ WHERE
+ ( 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
+
+ </select>
<delete id="deleteOptimizeDetailThirdParty">
delete from pp.other_flow_card
--
Gitblit v1.8.0