From 7aac0b821663de152ef665a030ebbef1d34b41f2 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 16 四月 2025 11:31:20 +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 | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 4ced3ea..e26a46c 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
@@ -559,17 +559,21 @@
<!--妯℃嫙璁＄畻鏌ヨ娴佺▼鍗�-->
<select id="selectProjectComputeMp">
select
- 娴佺▼鍗″彿 as process_id,
- 灞� as technology_number,
- 鎬诲眰鏁� as TotalFloors,
+ 娴佺▼鍗″彿 as processId,
+ 灞� as technologyNumber,
+ 鎬诲眰鏁� as total_layers,
瑙勬牸 as TotalNumber,
- 鏁伴噺 as quantity,
+ 鏁伴噺 as total_num,
椤圭洰 as project,
浜у搧鍚嶇О as glass_child,
- 闈㈢Н as area,
+ 闈㈢Н as total_area,
tempering as tempering,
merge as merge,
- patch_state as patch_state
+ patch_state as patch_state,
+ 0 as allow_rotate,
+ 0 as curtain_wall,
+ 0 as priority_level,
+ 1 as is_must
from pp.v_optimize_init_project_process_summary where project_no = #{projectNo}
</select>
--
Gitblit v1.8.0