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 | 129 ++++++++++++++++++++++++++++++------------
1 files changed, 92 insertions(+), 37 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 763cb53..e26a46c 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
@@ -456,9 +456,9 @@
GlassType as glassType,
patch_state,
鍗犵敤 as occupyState
- FROM pp.v_optimize_porject_modify where
+ FROM pp.v_optimize_porject_modify_merg where
GlassType REGEXP #{type} and GlassType REGEXP #{thickness}
- and (宸ョ▼鍙� is null or 宸ョ▼鍙� = #{projectNO}) order by 鍗犵敤
+ and (宸ョ▼鍙� is null or 宸ョ▼鍙� = #{projectNO}) order by 鍗犵敤,patch_state,娴佺▼鍗″彿
</select>
<!--宸ョ▼绠＄悊-->
@@ -488,7 +488,7 @@
`p`.`update_time` AS `Modify time`
from pp.optimize_project as p
left join pp.optimize_admin as a on p.creater = a.Id
- where (`p`.`state` > -(1))
+ where (`p`.`state` > 1)
and DATE (`p`.`create_time`) BETWEEN #{startSelectTime} AND #{endSelectTime}
<if test="optimizeProjectMange.projectNumber != null and optimizeProjectMange.projectNumber != ''">
and p.project_no regexp #{optimizeProjectMange.projectNumber}
@@ -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>
@@ -603,35 +607,81 @@
<!--妯℃嫙璁＄畻娴佺▼鍗¤鎯�2-->
<select id="selectComputeDetailMp">
- SELECT
- d.width AS width,
- d.height AS height,
- f.quantity AS quantity,
- d.building_number AS `Storey Number`,
- d.shape AS shape,
- round(g.area * f.quantity, 4) AS area,
- g.icon AS `Label type`,
- dal.patch_status,
- g.technology_number,
- g.order_number,
- fl.layers_number,
- g.child_width,
- g.child_height,
- fl.process_id
+ select `f`.`order_id` AS order_id,
+ `f`.`order_number` AS order_number,
+ `d`.`width` AS maxwidth,
+ `d`.`height` AS maxheight,
+ `g`.`child_width` AS width,
+ `g`.`child_height` AS height,
+ `f`.`process_id` AS process_id,
+ sum(`f`.`quantity`) AS quantity,
+ `f`.`technology_number` AS technology_number,
+ `d`.`building_number` AS building_number,
+ `d`.`shape` AS shape,
+ sum(round((`g`.`area` * `f`.`quantity`), 4)) AS area,
+ `g`.`icon` AS icon
+ from ((
+ `pp`.`flow_card` `f`
+ left join `sd`.`order_detail` `d` on (((`f`.`order_id` = `d`.`order_id`)
+ and (`f`.`order_number` = `d`.`order_number`))))
+ left join `sd`.`order_glass_detail` `g` on (((`f`.`order_id` = `g`.`order_id`)
+ and (`f`.`order_number` = `g`.`order_number`)
+ and (`f`.`technology_number` = `g`.`technology_number`))))
+ where (`f`.`layout_status` != 0)
+ and f.process_id = #{processId}
+ and f.technology_number = #{technologyNumber}
+ group by `f`.`process_id`,
+ `f`.`technology_number`,
+ `f`.`order_id`,
+ `f`.`order_number`,
+ `d`.`width`,
+ `d`.`height`,
+ `g`.`child_width`,
+ `g`.`child_height`,
+ `f`.`quantity`,
+ `d`.`building_number`,
+ `d`.`shape`,
+ `g`.`area`,
+ `g`.`icon`
+ </select>
- FROM
- pp.flow_card f
- LEFT JOIN pp.optimize_project p ON f.project_no = p.project_no
- LEFT JOIN sd.order o ON f.order_id = o.order_id
- LEFT JOIN sd.order_detail d ON f.order_id = d.order_id AND f.order_number = d.order_number
- LEFT JOIN sd.order_glass_detail g ON f.order_id = g.order_id AND f.order_number = g.order_number AND f.technology_number = g.technology_number
- LEFT JOIN sd.product_detail p2 ON d.product_id = p2.prod_id AND f.technology_number = p2.glass_sort
- LEFT JOIN pp.optimize_project j ON f.project_no = j.project_no
- LEFT JOIN pp.damage_details dal ON dal.order_number = g.order_number AND dal.technology_number = g.technology_number and f.process_id=dal.process_id
- LEFT JOIN pp.flow_card fl ON fl.order_id = g.order_id AND fl.order_number = g.order_number AND fl.technology_number = g.technology_number
- WHERE
- p.state IN (1, 2) and
- f.process_id = #{processId}
+ <select id="selectComputeDetailMpPatchState">
+ select `l`.`order_id` AS order_id,
+ `l`.`order_sort` AS order_number,
+ `d`.`width` AS maxwidth,
+ `d`.`height` AS maxheight,
+ `g`.`child_width` AS width,
+ `g`.`child_height` AS height,
+ `l`.`process_id` AS process_id,
+ `l`.`patch_num` AS quantity,
+ `l`.`technology_number` AS technology_number,
+ `d`.`building_number` AS building_number,
+ `d`.`shape` AS shape,
+ round((`g`.`area` * `l`.`patch_num`), 4) AS area,
+ `g`.`icon` AS icon
+ from (((
+ `pp`.`patch_log` `l`
+ left join (select `pp`.`optimize_project`.`project_no` AS `project_no`
+ from `pp`.`optimize_project`
+ where ((`optimize_project`.`state` = 1)or (`optimize_project`.`state` = 2))) `p` on ((`l`.`project_no` = `p`.`project_no`)))
+ left join `sd`.`order_detail` `d` on (((`l`.`order_id` = `d`.`order_id`)and (`l`.`order_sort` = `d`.`order_number`))))
+ left join `sd`.`order_glass_detail` `g` on (((`l`.`order_id` = `g`.`order_id`)and (`l`.`order_sort` = `g`.`order_number`)
+ and (`l`.`technology_number` = `g`.`technology_number`))))
+ where `l`.process_id = #{processId}
+ and `l`.technology_number = #{technologyNumber}
+ group by `l`.`process_id`,
+ `l`.`technology_number`,
+ `l`.`order_id`,
+ `l`.`order_sort`,
+ `d`.`width`,
+ `d`.`height`,
+ `g`.`child_width`,
+ `g`.`child_height`,
+ `l`.`patch_num`,
+ `d`.`building_number`,
+ `d`.`shape`,
+ `g`.`area`,
+ `g`.`icon`
</select>
<select id="getProcessCardDetailmMp">
@@ -722,6 +772,11 @@
group by process_id,technology_number
</select>
+ <update id="updateProjectMp">
+ update pp.optimize_project set project_name=#{projectNmae},glass_total=#{sumQuantity},glass_total_area= #{sumArea},
+ type=#{type},process_qty=#{processIdCount},process_cards=#{processId} where project_no=#{projectId}
+ </update>
+
<insert id="addProjectMp">
insert into pp.optimize_project (project_no, project_name, order_glass_type, order_glass_thickness,glass_type, glass_thickness,
glass_total,glass_total_area,type,state,process_qty,process_cards)
--
Gitblit v1.8.0