From 5b8140730d40e3c44d77828358e09c1f52fc33c2 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 15 四月 2025 16:26:16 +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 | 399 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 324 insertions(+), 75 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 69d1eab..e26a46c 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
@@ -62,8 +62,8 @@
<select id="projectInfoMp">
SELECT
f.order_number,
- g.child_width ,
- g.child_height ,
+ g.child_width as 'width',
+ g.child_height as 'height',
f.quantity ,
d.shape ,
op.process_cards ,
@@ -76,7 +76,8 @@
f.technology_number ,
g.glass_child ,
g.icon,
- op.project_name
+ op.project_name,
+ d.processing_note
FROM
((pp.flow_card AS f
LEFT JOIN sd.order_detail AS d ON (((f.order_id = d.order_id) AND (f.order_number = d.order_number))))
@@ -88,6 +89,132 @@
f.order_id,
f.technology_number,
f.order_number;
+ </select>
+
+ <!--绗竴娆′紭鍖栨煡璇�-->
+ <select id="firstOptimization">
+ ( SELECT
+ c.project_no,
+ d.child_width as 'width',
+ d.child_height as 'height',
+ c.quantity,
+ o.shape,
+ concat( c.process_id, '-', c.technology_number ) AS 'process_id',
+ c.technology_number,
+ d.glass_child,
+ o.product_name,
+ o.price,
+ o.remarks,
+ o.building_number,
+ round( d.area * c.quantity, 4 ) as 'area',
+ c.order_number,
+ d.icon,
+ op.project_name
+ FROM
+ pp.flow_card c
+ LEFT JOIN sd.order_detail o ON c.order_id = o.order_id
+ AND c.order_number = o.order_number
+ LEFT JOIN sd.order_glass_detail d ON c.order_id = d.order_id
+ AND c.order_number = d.order_number
+ AND c.technology_number = d.technology_number
+ INNER JOIN pp.optimize_project AS op ON op.project_no = c.project_no
+ WHERE
+ c.project_no IS NOT NULL
+ and c.project_no = #{projectNo}
+ ORDER BY
+ c.process_id,
+ c.order_number
+ ) union
+ (
+ SELECT
+ c.project_no,
+ d.child_width as 'width',
+ d.child_height as 'height',
+ c.patch_num as quantity,
+ o.shape,
+ concat( c.process_id, '-', c.technology_number ) AS 'process_id',
+ c.technology_number,
+ d.glass_child,
+ o.product_name,
+ o.price,
+ o.remarks,
+ o.building_number,
+ round( d.area * c.patch_num, 4 ) as 'area',
+ c.order_sort as order_number,
+ d.icon,
+ op.project_name
+ FROM
+ pp.patch_log c
+ LEFT JOIN sd.order_detail o ON c.order_id = o.order_id
+ AND c.order_sort = o.order_number
+ LEFT JOIN sd.order_glass_detail d ON c.order_id = d.order_id
+ AND c.order_sort = d.order_number
+ AND c.technology_number = d.technology_number
+ INNER JOIN pp.optimize_project AS op ON op.project_no = c.project_no
+ WHERE
+ c.project_no IS NOT NULL
+ and c.project_no = #{projectNo}
+ ORDER BY
+ c.process_id,
+ c.order_sort)
+ </select>
+
+
+ <!--绗竴娆′紭鍖栨煡璇�-->
+ <select id="analogComputationOptimization">
+ SELECT
+ h.project_no,
+ h.layout_id,
+ h.width AS width,
+ h.height AS height,
+ count( 1 ) AS quantity,
+ o.shape,
+ concat( h.process_id, '-', h.layer ) AS 'process_id',
+ h.layer,
+ d.glass_child,
+ o.product_name,
+ o.price,
+ o.remarks,
+ o.building_number,
+ round( d.area * count( 1 ), 4 ) AS 'area',
+ c.order_number,
+ d.icon,
+ o.price
+ from
+ pp.`optimize_heat_detail` h
+ LEFT JOIN pp.flow_card c ON h.process_id = c.process_id
+ AND h.layer = c.technology_number
+ AND h.order_sort = c.order_number
+ LEFT JOIN sd.order_detail o ON c.order_id = o.order_id
+ AND c.order_number = o.order_number
+ LEFT JOIN sd.order_glass_detail d ON c.order_id = d.order_id
+ AND c.order_number = d.order_number
+ AND c.technology_number = d.technology_number
+ WHERE
+ h.project_no = #{projectNo}
+ GROUP BY
+ h.project_no,
+ h.layout_id,
+ h.width,
+ h.height,
+ h.process_id,
+ h.layer,
+ d.area,
+ c.quantity,
+ d.child_width,
+ d.child_height,
+ o.shape,
+ d.glass_child,
+ o.product_name,
+ o.price,
+ o.remarks,
+ o.building_number,
+ c.order_number,
+ d.icon,
+ o.price
+ ORDER BY
+ LENGTH( h.layout_id ),
+ h.layout_id;
</select>
<!--宸ョ▼淇℃伅娴佺▼鍗�-->
@@ -121,12 +248,21 @@
</select>
+ <select id="getPatchLogList">
+ SELECT *
+ FROM
+ pp.patch_log
+ WHERE
+ project_no = #{projectNo}
+
+ </select>
+
<!--搴撳瓨淇℃伅-->
<select id="materialStoreMp">
SELECT
i.id AS id,
i.producer AS producer,
- i.available_quantity AS available_quantity,
+ i.available_quantity-i.plan_quantity AS available_quantity,
JSON_EXTRACT(s.json, '$.width') AS width,
JSON_EXTRACT(s.json, '$.height') AS height,
JSON_EXTRACT(s.json, '$.thickness') AS thickness,
@@ -142,12 +278,29 @@
(
(`s`.`type` = '鍘熺墖')
AND (`i`.`optimize_state` = 1)
- AND (`i`.`available_quantity` > 0)
+ AND (`i`.`available_quantity`-i.plan_quantity > 0)
AND JSON_EXTRACT(s.json, '$.thickness') = #{thickness}
AND JSON_EXTRACT(s.json, '$.model') = #{model}
)
ORDER BY
`i`.`available_quantity` DESC ;
+ </select>
+
+
+ <select id="materialStoreOptimizeUse">
+ select ms.id AS id,
+ ou.use_count AS processingQuantity,
+ ou.width,
+ ou.height,
+ ou.left_trim as leftTrim,
+ ou.down_trim as downTrim,
+ ou.up_trim as upTrim,
+ ou.right_trim as rightTrim,
+ JSON_EXTRACT(ms.json, '$.thickness') AS thickness,
+ JSON_EXTRACT(ms.json, '$.name') AS name,
+ JSON_EXTRACT(ms.json, '$.model') AS model
+ from pp.optimize_use ou
+ left join mm.material_store ms on ou.raw_stock_code=ms.id where project_no=#{projectNumber} and state=1
</select>
<select id="selectWordOrder" resultMap="wordOrderMap">
@@ -252,7 +405,8 @@
椤圭洰 as project,
鍗曠墖鍚嶇О as glass_child,
闈㈢Н as area,
- GlassType as glassType
+ GlassType as glassType,
+ patch_state
FROM pp.v_optimize_process_whole where
CONCAT( JSON_UNQUOTE( JSON_EXTRACT( GlassType, '$.thickness' )), JSON_UNQUOTE( JSON_EXTRACT( GlassType, '$.color' )) )= #{optionVal}
</select>
@@ -267,7 +421,8 @@
椤圭洰 as project,
鍗曠墖鍚嶇О as glass_child,
闈㈢Н as area,
- GlassType as glassType
+ GlassType as glassType,
+ patch_state
FROM pp.v_optimize_process_normal where
CONCAT( JSON_UNQUOTE( JSON_EXTRACT( GlassType, '$.thickness' )), JSON_UNQUOTE( JSON_EXTRACT( GlassType, '$.color' )) )= #{optionVal}
</select>
@@ -282,9 +437,28 @@
椤圭洰 as project,
鍗曠墖鍚嶇О as glass_child,
闈㈢Н as area,
- GlassType as glassType
+ GlassType as glassType,
+ patch_state
FROM pp.v_optimize_process_patch where
CONCAT( JSON_UNQUOTE( JSON_EXTRACT( GlassType, '$.thickness' )), JSON_UNQUOTE( JSON_EXTRACT( GlassType, '$.color' )) )= #{optionVal}
+ </select>
+
+ <select id="getFlowCardListModify">
+ SELECT 娴佺▼鍗″彿 as process_id,
+ 灞� as technology_number,
+ 鎬诲眰鏁� as TotalFloors,
+ 瑙勬牸 as TotalNumber,
+ 鏁伴噺 as quantity,
+ 褰㈢姸 as shape,
+ 椤圭洰 as project,
+ 浜у搧鍚嶇О as glass_child,
+ 闈㈢Н as area,
+ GlassType as glassType,
+ patch_state,
+ 鍗犵敤 as occupyState
+ FROM pp.v_optimize_porject_modify_merg where
+ GlassType REGEXP #{type} and GlassType REGEXP #{thickness}
+ and (宸ョ▼鍙� is null or 宸ョ▼鍙� = #{projectNO}) order by 鍗犵敤,patch_state,娴佺▼鍗″彿
</select>
<!--宸ョ▼绠＄悊-->
@@ -314,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}
@@ -384,43 +558,23 @@
<!--妯℃嫙璁＄畻鏌ヨ娴佺▼鍗�-->
<select id="selectProjectComputeMp">
- SELECT
- fc.process_id,
- fc.technology_number,
- fc.project_no,
- fcss.TotalFloors,
- COUNT(fc.order_number) AS TotalNumber,
- SUM(fc.quantity) AS quantity,
- ROUND(SUM(od.width * od.height * fc.quantity / 1000000), 2) AS area,
- o.project,
- ogd.glass_child,
- od.shape,
- SUBSTRING(glass_child, 1, LOCATE('mm', glass_child) - 1) as thickness,
- SUBSTRING(glass_child, LOCATE('mm', glass_child) + 2) as glassType
- FROM
- pp.flow_card AS fc
- LEFT JOIN sd.`order` AS o ON fc.order_id = o.order_id
- LEFT JOIN sd.order_detail AS od ON od.order_id = fc.order_id AND od.order_number = fc.order_number
- LEFT JOIN sd.order_glass_detail AS ogd
- ON ogd.order_id = fc.order_id AND ogd.order_number = fc.order_number AND
- ogd.technology_number = fc.technology_number
- LEFT JOIN (
- SELECT
- fcs.process_id,
- fcs.order_number,
- COUNT(DISTINCT fcs.technology_number) AS TotalFloors
- FROM
- pp.flow_card AS fcs
- GROUP BY
- fcs.process_id, fcs.order_number
- ) AS fcss
- ON fcss.process_id = fc.process_id AND fcss.order_number = fc.order_number
- WHERE
- fc.project_no = #{projectNo}
- GROUP BY
- fc.process_id, fc.technology_number
- ORDER BY
- fc.process_id, fc.technology_number;
+ select
+ 娴佺▼鍗″彿 as processId,
+ 灞� as technologyNumber,
+ 鎬诲眰鏁� as total_layers,
+ 瑙勬牸 as TotalNumber,
+ 鏁伴噺 as total_num,
+ 椤圭洰 as project,
+ 浜у搧鍚嶇О as glass_child,
+ 闈㈢Н as total_area,
+ tempering as tempering,
+ merge as merge,
+ 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>
<select id="selectProjectCount">
@@ -453,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">
@@ -536,9 +736,19 @@
where process_id=#{processId} and technology_number=#{technologyNumber}
</update>
+ <update id="updatePatchLogProject">
+ UPDATE pp.patch_log set project_no=#{projectId}
+ where process_id=#{processId} and technology_number=#{technologyNumber}
+ </update>
+
<update id="updateFlowCardProjectReturn">
UPDATE pp.flow_card set project_no=null,layout_status=1
- where process_id=#{processId} and technology_number=#{technologyNumber}
+ where process_id=#{processId} and technology_number=#{technologyNumber} and project_no=#{projectId}
+ </update>
+
+ <update id="updatePatchLogProjectReturn">
+ UPDATE pp.patch_log set project_no=null
+ where process_id=#{processId} and technology_number=#{technologyNumber} and project_no=#{projectId}
</update>
<select id="getSelectArea">
@@ -553,6 +763,19 @@
where fc.process_id=#{processId} and fc.technology_number=#{technologyNumber}
group by fc.process_id,fc.technology_number
</select>
+
+ <select id="getSelectAreaPatchLog">
+ select
+ sum(patch_area)
+ from pp.patch_log
+ where process_id=#{processId} and technology_number=#{technologyNumber}
+ 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,
@@ -684,4 +907,30 @@
JSON_EXTRACT( oc.config_detail, '$.y_space' ) as y_space
from pp.optimize_admin oa left join pp.optimize_config oc on oa.h_id=oc.id where name='admin'
</select>
+
+ <select id="getEdgeTrimming">
+ select JSON_EXTRACT( oc.config_detail, '$.left_trim' ) as leftTrim,
+ JSON_EXTRACT( oc.config_detail, '$.up_trim' ) as upTrim,
+ JSON_EXTRACT( oc.config_detail, '$.right_trim' ) as rightTrim,
+ JSON_EXTRACT( oc.config_detail, '$.down_trim' ) as downTrim,
+ JSON_EXTRACT( oc.config_detail, '$.auto_fill_trim' ) as autoFillTrim,
+ JSON_EXTRACT( oc.config_detail, '$.quick_trim' ) as quickTrim
+ from pp.optimize_config oc where config_type=5
+ </select>
+
+ <select id="getGrindingTrimming">
+ select JSON_EXTRACT( oc.config_detail, '$.left_edge' ) as leftEdge,
+ JSON_EXTRACT( oc.config_detail, '$.up_edge' ) as upEdge,
+ JSON_EXTRACT( oc.config_detail, '$.right_edge' ) as rightEdge,
+ JSON_EXTRACT( oc.config_detail, '$.down_edge' ) as downEdge,
+ JSON_EXTRACT( oc.config_detail, '$.auto_fill_edge' ) as autoFillEdge,
+ JSON_EXTRACT( oc.config_detail, '$.quick_edge' ) as quickEdge,
+ JSON_EXTRACT( oc.config_detail, '$.min_auto_lenght' ) as minAutoLenght
+ from pp.optimize_config oc where config_type=4
+ </select>
+
+ <update id="updateOptimizeConfig">
+ UPDATE pp.optimize_config set config_detail=#{json},create_time=now()
+ where config_type=#{type}
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0