From 7c30e26f3cc97ebcbb2cf86e2026b10f2e23994d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 08 十二月 2025 16:40:26 +0800
Subject: [PATCH] 流程卡添加订单类型、补片流程卡调整样式，工序待完成报表添加厚度
---
north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml | 1150 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 1,092 insertions(+), 58 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 f6f616d..6658d93 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
@@ -41,6 +41,8 @@
<result property="thickness" column="thickness"/>
<result property="type" column="type"/>
<result property="state" column="state"/>
+ <result property="temperingState" column="Tempering state"/>
+ <result property="optimizeState" column="Optimize state"/>
<result property="quantity" column="quantity"/>
<result property="area" column="area"/>
<result property="processCardQuantity" column="process Card Quantity"/>
@@ -93,37 +95,45 @@
<!--绗竴娆′紭鍖栨煡璇�-->
<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
+ (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.process_id AS 'process_ids',
+ c.technology_number as layer,
+ c.layers_number as total_layer,
+ 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,
+ 0 as patch_state,
+ a.id as rackNo
+ 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
+ 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
+ left join
+ (select (@row_number := @row_number + 1) as id,process_id as process_id,technology_number as technology_number from (select process_id,technology_number from pp.flow_card tt where project_no =#{projectNo} group by process_id,technology_number) tt,(select @row_number := 0) as t) a
+ on a.process_id=c.process_id and a.technology_number=c.technology_number
+ WHERE
+ c.project_no IS NOT NULL
+ and c.project_no = #{projectNo}
+ ORDER BY
+ a.id,
+ c.process_id,
+ c.order_number
) union
(
SELECT
@@ -133,7 +143,9 @@
c.patch_num as quantity,
o.shape,
concat( c.process_id, '-', c.technology_number ) AS 'process_id',
- c.technology_number,
+ c.process_id AS 'process_ids',
+ c.technology_number as layer,
+ fc.layers_number as total_layer,
d.glass_child,
o.product_name,
o.price,
@@ -142,7 +154,9 @@
round( d.area * c.patch_num, 4 ) as 'area',
c.order_sort as order_number,
d.icon,
- op.project_name
+ op.project_name,
+ 1 as patch_state,
+ a.id as rackNo
FROM
pp.patch_log c
LEFT JOIN sd.order_detail o ON c.order_id = o.order_id
@@ -151,26 +165,128 @@
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
+ LEFT JOIN pp.flow_card fc ON c.process_id = fc.process_id and fc.technology_number=c.technology_number
+ left join
+ (select (@row_number := @row_number + 1) as id,process_id as process_id,technology_number as technology_number from (select process_id,technology_number from pp.flow_card tt where project_no =#{projectNo} group by process_id,technology_number) tt,(select @row_number := 0) as t) a
+ on a.process_id=c.process_id and a.technology_number=c.technology_number
WHERE
c.project_no IS NOT NULL
and c.project_no = #{projectNo}
ORDER BY
+ a.id,
c.process_id,
c.order_sort)
</select>
- <!--绗竴娆′紭鍖栨煡璇�-->
+
+ <select id="directOptimization">
+ (SELECT
+ c.project_no,
+ d.child_width as 'width',
+ d.child_height as 'height',
+ (d.child_width + d.child_height) * 2/ 1000 as 'perimeter',
+ c.quantity,
+ od.shape,
+ concat( c.process_id, '-', c.technology_number ) AS 'process_id',
+ c.process_id AS processId,
+ c.technology_number as layer,
+ c.layers_number as totalLayer,
+ d.glass_child,
+ od.price,
+ od.remarks,
+ round( d.area * c.quantity, 4 ) as 'area',
+ c.order_number,
+ d.icon AS markIcon,
+ op.project_name,
+ 0 as patchState,
+ c.rack AS rackNo,
+ d.process,
+ o.order_id AS orderNo,
+ o.customer_name AS customerName,
+ o.processing_note AS processingNote,
+ o.project AS projectName,
+ od.product_name AS productName,
+ od.building_number AS buildingNumber
+ FROM
+ pp.flow_card c
+ 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
+ LEFT JOIN sd.ORDER o ON o.order_id = c.order_id
+ LEFT JOIN sd.order_detail od ON c.order_id = od.order_id
+ AND c.order_number = od.order_number
+ 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',
+ (d.child_width + d.child_height) * 2/ 1000 as 'perimeter',
+ c.patch_num as quantity,
+ od.shape,
+ concat( c.process_id, '-', c.technology_number ) AS 'process_id',
+ c.process_id AS 'process_ids',
+ c.technology_number as layer,
+ fc.layers_number as total_layer,
+ d.glass_child,
+ od.price,
+ od.remarks,
+ round( d.area * c.patch_num, 4 ) as 'area',
+ c.order_sort as order_number,
+ d.icon,
+ op.project_name,
+ 1 as patch_state,
+ a.id as rackNo,
+ d.process,
+ o.order_id AS orderNo,
+ o.customer_name AS customerName,
+ o.processing_note AS processingNote,
+ o.project AS projectName,
+ od.product_name AS productName,
+ od.building_number AS buildingNumber
+ FROM
+ pp.patch_log c
+ 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
+ LEFT JOIN pp.flow_card fc ON c.process_id = fc.process_id and fc.technology_number=c.technology_number
+ LEFT JOIN sd.ORDER o ON o.order_id = c.order_id
+ LEFT JOIN sd.order_detail od ON fc.order_id = od.order_id
+ AND fc.order_number = od.order_number
+ left join
+ (select (@row_number := @row_number + 1) as id,process_id as process_id,technology_number as technology_number from (select process_id,technology_number from pp.flow_card tt where project_no =#{projectNo} group by process_id,technology_number) tt,(select @row_number := 0) as t) a
+ on a.process_id=c.process_id and a.technology_number=c.technology_number
+ WHERE
+ c.project_no IS NOT NULL
+ and c.project_no = #{projectNo}
+ ORDER BY
+ a.id,
+ c.process_id,
+ c.order_sort)
+ </select>
+
+ <!--浼樺寲鏌ヨ-->
<select id="analogComputationOptimization">
SELECT
h.project_no,
- h.layout_id,
+ h.layout_id as rackNo,
h.width AS width,
h.height AS height,
count( 1 ) AS quantity,
o.shape,
concat( h.process_id, '-', h.layer ) AS 'process_id',
+ h.process_id as process_ids,
h.layer,
+ c.layers_number as total_layer,
d.glass_child,
o.product_name,
o.price,
@@ -179,7 +295,8 @@
round( d.area * count( 1 ), 4 ) AS 'area',
c.order_number,
d.icon,
- o.price
+ o.price,
+ h.patch_state
from
pp.`optimize_heat_detail` h
LEFT JOIN pp.flow_card c ON h.process_id = c.process_id
@@ -215,6 +332,119 @@
ORDER BY
LENGTH( h.layout_id ),
h.layout_id;
+ </select>
+
+
+ <!--浼樺寲鏌ヨ-->
+ <select id="computeAndOptimization">
+ SELECT
+ c.project_no,
+ c.rack AS rackNo,
+# h.layout_id as heatLayoutId,
+ h.width AS width,
+ h.height AS height,
+ (h.width + h.height) * 2 / 1000 as 'perimeter',
+ od.shape,
+ count( 1 ) AS quantity,
+ concat( h.process_id, '-', h.layer ) AS process_id,
+ c.process_id AS processId,
+ h.process_id as process_ids,
+ h.layer,
+ c.layers_number as totalLayer,
+ d.glass_child,
+ od.price,
+ od.remarks,
+ round( d.area * count( 1 ), 4 ) AS 'area',
+ c.order_number,
+ h.order_sort AS orderSort,
+ d.icon AS markIcon,
+ h.patch_state AS patchState,
+ d.process,
+ o.order_id AS orderNo,
+ o.customer_name AS customerName,
+ o.processing_note AS processingNote,
+ o.project AS projectName,
+ od.product_name AS productName,
+ od.building_number AS buildingNumber
+ 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_glass_detail d ON c.order_id = d.order_id
+ AND c.order_number = d.order_number
+ AND c.technology_number = d.technology_number
+ LEFT JOIN sd.order o on o.order_id = c.order_id
+ LEFT JOIN sd.order_detail od on c.order_id = od.order_id and c.order_number = od.order_number
+ WHERE
+ h.project_no = #{projectNo}
+ GROUP BY
+# h.layout_id,
+ h.width,
+ h.height,
+ h.process_id,
+ h.layer,
+ d.area,
+ c.quantity,
+ d.child_width,
+ d.child_height,
+ c.order_number,
+ d.icon
+ ORDER BY
+ LENGTH( h.layout_id ),
+ h.layout_id;
+ </select>
+
+
+
+ <select id="getOptimizeDetail">
+ SELECT
+ h.project_no,
+ h.rack_no as rackNo,
+ h.o_width AS width,
+ h.o_height AS height,
+ (h.height-h.o_height)/2 as shortGrind1,
+ (h.height-h.o_height)/2 as shortGrind2,
+ (h.width-h.o_width)/2 as longGrind2,
+ (h.width-h.o_width)/2 as longGrind1,
+ count( 1 ) AS quantity,
+ o.shape,
+ concat( h.process_id, '-', h.layer ) AS 'process_id',
+ h.process_id as process_ids,
+ h.layer,
+ h.total_layer as total_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,
+ h.patch_state
+ from
+ pp.`optimize_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.rack_no,
+ h.width,
+ h.height,
+ h.process_id,
+ h.layer,
+ c.order_number
+ ORDER BY
+ h.rack_no;
</select>
<!--宸ョ▼淇℃伅娴佺▼鍗�-->
@@ -260,9 +490,11 @@
<!--搴撳瓨淇℃伅-->
<select id="materialStoreMp">
SELECT
- i.id AS id,
+ i.material_code AS id,
i.producer AS producer,
i.available_quantity-i.plan_quantity AS available_quantity,
+ null as processingQuantity,
+ 1 as materialType,
JSON_EXTRACT(s.json, '$.width') AS width,
JSON_EXTRACT(s.json, '$.height') AS height,
JSON_EXTRACT(s.json, '$.thickness') AS thickness,
@@ -292,6 +524,8 @@
i.id AS id,
'' AS producer,
i.quantity AS available_quantity,
+ null as processingQuantity,
+ 0 as materialType,
i.width,
i.height,
i.thickness,
@@ -310,6 +544,8 @@
i.id AS id,
i.producer AS producer,
i.available_quantity-i.plan_quantity AS available_quantity,
+ null as processingQuantity,
+ 1 as materialType,
JSON_EXTRACT(s.json, '$.width') AS width,
JSON_EXTRACT(s.json, '$.height') AS height,
JSON_EXTRACT(s.json, '$.thickness') AS thickness,
@@ -335,6 +571,8 @@
i.id AS id,
'' AS producer,
i.quantity AS available_quantity,
+ null as processingQuantity,
+ 0 as materialType,
i.width,
i.height,
i.thickness,
@@ -349,7 +587,7 @@
<select id="materialStoreOptimizeUse">
- select ms.id AS id,
+ select ou.raw_stock_code AS id,
ou.use_count AS processingQuantity,
ou.width,
ou.height,
@@ -359,7 +597,8 @@
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
+ JSON_EXTRACT(ms.json, '$.model') AS model,
+ (ou.width * ou.height * ou.use_count / 1000000.0) AS totalArea
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>
@@ -464,7 +703,7 @@
鏁伴噺 as quantity,
褰㈢姸 as shape,
椤圭洰 as project,
- 鍗曠墖鍚嶇О as glass_child,
+ 浜у搧鍚嶇О as glass_child,
闈㈢Н as area,
GlassType as glassType,
patch_state
@@ -480,7 +719,7 @@
鏁伴噺 as quantity,
褰㈢姸 as shape,
椤圭洰 as project,
- 鍗曠墖鍚嶇О as glass_child,
+ 浜у搧鍚嶇О as glass_child,
闈㈢Н as area,
GlassType as glassType,
patch_state
@@ -496,7 +735,7 @@
鏁伴噺 as quantity,
褰㈢姸 as shape,
椤圭洰 as project,
- 鍗曠墖鍚嶇О as glass_child,
+ 浜у搧鍚嶇О as glass_child,
闈㈢Н as area,
GlassType as glassType,
patch_state
@@ -531,6 +770,8 @@
p.`glass_thickness` AS `Thickness`,
p.`type` AS `Type`,
p.`state` AS `State`,
+ p.`tempering_state` AS `Tempering state`,
+ p.`optimize_state` AS `Optimize state`,
p.`glass_total` AS `Quantity`,
p.`glass_total_area` AS `Area`,
p.`process_qty` AS `Process Card Quantity`,
@@ -544,12 +785,13 @@
`p`.`frist_stock_qty` AS `Amount of original glass usage 1`,
concat(`p`.`frist_cut_pct`, ' %') AS `Average cutting rate 1`,
`p`.`remark` AS `Notes`,
- `a`.`name` AS `Creator`,
+ `u`.`user_name` AS `Creator`,
`p`.`create_time` AS `Create time`,
`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)
+ left join erp_user_info.user as u on p.creater = u.login_name
+ where (`p`.`state` > 0)
+# and (tempering_state>0 or optimize_state>0)
and DATE (`p`.`create_time`) BETWEEN #{startSelectTime} AND #{endSelectTime}
<if test="optimizeProjectMange.projectNumber != null and optimizeProjectMange.projectNumber != ''">
and p.project_no regexp #{optimizeProjectMange.projectNumber}
@@ -563,6 +805,22 @@
<update id="updateProjectStateMp">
update pp.optimize_project as p
set p.state = #{state}
+ where p.project_no = #{projectNumber}
+ </update>
+
+ <!--淇敼妯℃嫙璁＄畻宸ョ▼鐘舵��-->
+ <update id="updateProjectTemperingStateMp">
+ update pp.optimize_project as p
+ set p.tempering_state = #{states},
+ p.load_rate = NULL,
+ p.furnaces_qty = NULL
+ where p.project_no = #{projectNumber}
+ </update>
+
+ <!--淇敼浼樺寲宸ョ▼鐘舵��-->
+ <update id="updateProjectOptimizeStateMp">
+ update pp.optimize_project as p
+ set p.optimize_state = #{states}
where p.project_no = #{projectNumber}
</update>
@@ -586,6 +844,21 @@
delete from pp.optimize_detail
where project_no = #{projectNumber}
</delete>
+
+ <delete id="deleteOptimizeLayout">
+ delete from pp.optimize_layout
+ where project_no = #{projectNumber}
+ </delete>
+
+ <delete id="deleteOptimizeProjectFile">
+ delete from pp.optimize_project_file
+ where project_no = #{projectNumber}
+ </delete>
+
+ <update id="updateOptimizeUse">
+ update pp.optimize_use set state=0
+ where project_no = #{projectNumber}
+ </update>
<select id="selectOptimizeDetailById">
select * from pp.optimize_detail
@@ -614,7 +887,8 @@
p.remark,
a.name,
p.create_time,
- p.update_time
+ p.update_time,
+ p.optimize_state
FROM
(
pp.optimize_project p
@@ -622,7 +896,7 @@
p.creater = a.Id
)))
WHERE
- ( p.state = 1 )
+ ( p.state = 1 ) and p.tempering_state=0 and optimize_state=0
ORDER BY
p.create_time DESC,
p.project_no
@@ -716,6 +990,7 @@
`g`.`area`,
`g`.`icon`
</select>
+
<select id="selectComputeDetailMpPatchState">
select `l`.`order_id` AS order_id,
@@ -844,16 +1119,23 @@
group by process_id,technology_number
</select>
+ <select id="selectPatchLogState">
+ select
+ count(*)
+ from pp.patch_log
+ where process_id=#{processId} and technology_number=#{technologyNumber} and order_sort=#{orderNumber} and project_no=#{projectNo}
+ </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}
+ type=#{type},process_qty=#{processIdCount},process_cards=#{processId},creater = #{userName} 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)
+ glass_total,glass_total_area,type,state,process_qty,process_cards,creater )
values (#{projectId}, #{projectNmae}, #{glassType}, #{glassThickness}, #{glassType}, #{glassThickness},#{sumQuantity}, #{sumArea},
- #{type},1,#{processIdCount},#{processId})
+ #{type},1,#{processIdCount},#{processId},#{userName})
</insert>
@@ -892,7 +1174,7 @@
NOW(),
NOW(),
0,
- #{glass.layers_number},
+ #{glass.technology_number},
#{glass.order_number},
#{glass.tempering_layout_id},
#{glass.tempering_feed_sequence},
@@ -904,6 +1186,53 @@
);
</foreach>
</insert>
+
+ <insert id="insertOptimizeHeatDetail">
+ INSERT INTO pp.optimize_heat_detail (
+ project_no,
+ process_id,
+ width,
+ height,
+ x_axis,
+ y_axis,
+ rotate_angle,
+ creater,
+ create_time,
+ update_time,
+ patch_state,
+ layer,
+ order_sort,
+ layout_id,
+ sort,
+ glass_id,
+ pair_width,
+ pair_height,
+ intRemark,
+ strRemark
+ ) VALUES (
+ #{projectId},
+ #{processId},
+ #{width},
+ #{height},
+ 0,
+ 0,
+ 0,
+ #{username},
+ NOW(),
+ NOW(),
+ #{patchState},
+ #{technologyNumber},
+ #{orderNumber},
+ 0,
+ #{index},
+ null,
+ #{width},
+ #{height},
+ null,
+ null
+ );
+ </insert>
+
<!--妯℃嫙璁＄畻缁撴灉淇濆瓨-->
<insert id="addratioResult" parameterType="map">
<foreach collection="ratioResult" item="glass">
@@ -931,11 +1260,200 @@
</foreach>
</insert>
+ <!--浼樺寲灏忕墖淇濆瓨-->
+ <insert id="addOptimizeDetail" parameterType="map">
+ <foreach collection="object" item="glass">
+ INSERT INTO pp.optimize_detail (
+ project_no,
+ process_id,
+ layer,
+ total_layer,
+ order_sort,
+ stock_id,
+ polys_id,
+ o_width,
+ o_height,
+ p_width,
+ p_height,
+ x_axis,
+ y_axis,
+ patch_state,
+ mark_icon,
+ isRotate,
+ glass_point,
+ glass_id,
+ rack_no
+ ) VALUES (
+ #{projectId},
+ #{glass.processId},
+ #{glass.layer},
+ #{glass.totalLayer},
+ #{glass.orderSort},
+ #{glass.stockSort},
+ #{glass.polySort},
+ #{glass.realWidth},
+ #{glass.realHeight},
+ #{glass.width},
+ #{glass.height},
+ #{glass.x},
+ #{glass.y},
+ #{glass.patchState},
+ #{glass.markIcon},
+ #{glass.isRotate},
+ #{glass.glassPoint},
+ CONCAT(
+ LPAD(SUBSTR(#{projectId}, 2), 8, '0'),
+ LPAD(#{glass.stockSort}, 4, '0'),
+ LPAD(#{glass.polySort}, 6, '0')
+ ),
+ #{glass.rackNo}
+ );
+ </foreach>
+ </insert>
+
+ <!--浼樺寲缁撴灉json鏍煎紡淇濆瓨-->
+ <insert id="addOptimizeProjectFile" >
+ INSERT INTO pp.optimize_project_file (
+ project_no,
+ type,
+ content,
+ create_time,
+ creater
+ ) VALUES (
+ #{projectId},
+ "浼樺寲缁撴灉",
+ #{object},
+ now(),
+ #{name}
+ );
+ </insert>
+
+ <!--浼樺寲鍘熺墖淇濆瓨-->
+ <insert id="addOptimizeLayout" parameterType="map">
+ <foreach collection="object " item="glass">
+ INSERT INTO pp.optimize_layout (
+ project_no,
+ stock_id,
+ width,
+ height,
+ realwidth,
+ realheight,
+ usage_rate,
+ stock_code,
+ up_trim,
+ down_trim,
+ left_trim,
+ right_trim,
+ count,
+ glass_count,
+ glass_area,
+ create_time
+ ) VALUES (
+ #{projectId},
+ #{glass.stockId},
+ #{glass.width},
+ #{glass.height},
+ #{glass.realWidth},
+ #{glass.realHeight},
+ #{glass.usageRate},
+ #{glass.stockCode},
+ #{glass.upTrim},
+ #{glass.downTrim},
+ #{glass.leftTrim},
+ #{glass.rightTrim},
+ #{glass.count},
+ #{glass.glassQuantity},
+ #{glass.glassArea},
+ now()
+ );
+ </foreach>
+ </insert>
+
+ <!--浼樺寲鍘熺墖淇濆瓨-->
+ <insert id="addOptimizeUse" parameterType="map">
+ <foreach collection="object " item="glass">
+ INSERT INTO pp.optimize_use (
+ project_no,
+ raw_stock_code,
+ type,
+ width,
+ height,
+ use_count,
+ not_use_count,
+ state,
+ left_trim,
+ down_trim,
+ right_trim,
+ up_trim,
+ creater,
+ create_time
+ ) VALUES (
+ #{projectId},
+ #{glass.stockCode},
+ 1,
+ #{glass.width}+#{glass.leftTrim}+#{glass.rightTrim},
+ #{glass.height}+#{glass.downTrim}+#{glass.upTrim},
+ #{glass.count},
+ #{glass.count},
+ 1,
+ #{glass.leftTrim},
+ #{glass.downTrim},
+ #{glass.rightTrim},
+ #{glass.upTrim},
+ #{name},
+ now()
+ );
+ </foreach>
+ </insert>
+ <insert id="addOptimizeOffcut">
+ INSERT INTO pp.optimize_offcut (
+ project_no,
+ stock_id,
+ width,
+ height,
+ x_axis,
+ y_axis,
+ model,
+ thickness
+ ) VALUES (
+ #{projectId},
+ #{map.stockSort},
+ #{map.width},
+ #{map.height},
+ #{map.x},
+ #{map.y},
+ #{glassType},
+ #{glassThickness}
+
+ )
+ </insert>
+ <insert id="addUpdateOffcut">
+ INSERT INTO pp.optimize_offcut (
+ project_no,
+ stock_id,
+ width,
+ height,
+ x_axis,
+ y_axis,
+ model,
+ thickness
+ ) VALUES (
+ #{processId},
+ #{stockId},
+ #{detail.width},
+ #{detail.height},
+ #{detail.x},
+ #{detail.y},
+ #{glassType},
+ #{glassThickness})
+ </insert>
+
+
<!--妯℃嫙璁＄畻宸ョ▼鏇存柊-->
<update id="addratioProjectResult" parameterType="map">
UPDATE pp.optimize_project
SET
- state = 10,
+ tempering_state = 1,
furnaces_qty=#{resultSum[0]},
load_rate=#{resultSum[1]},
chaos_pct = #{inputValues.chaos_pct},
@@ -950,10 +1468,11 @@
project_no = #{inputValues.project_no}
</update>
+
<!--浼樺寲璁剧疆淇濆瓨-->
<update id="optimizeParmsSave">
update erp_user_info.user as u
- set u.optimize_parms = #{jsonString}
+ set u.optimize_parms = #{jsonString} where user_name=#{username}
</update>
<update id="updateOptimizeResult">
@@ -964,7 +1483,7 @@
<update id="updateOptimizeDetail">
update pp.optimize_detail
- set heat_layout_id=#{layoutId},heat_layout_sort=#{sort},glass_id=concat(process_id,'|',#{layoutId},'|',#{sort})
+ set heat_layout_id=#{layoutId},heat_layout_sort=#{sort}
where id=#{id};
</update>
@@ -984,7 +1503,7 @@
JSON_EXTRACT( oc.config_detail, '$.load_length' ) as load_length,
JSON_EXTRACT( oc.config_detail, '$.x_space' ) as x_space,
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'
+ from pp.optimize_admin oa where config_type=1 and creater=#{username}
</select>
<select id="getEdgeTrimming">
@@ -994,7 +1513,7 @@
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
+ from pp.optimize_config oc where config_type=5 and creater=#{username}
</select>
<select id="getGrindingTrimming">
@@ -1005,12 +1524,69 @@
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
+ from pp.optimize_config oc where config_type=4 and creater=#{username}
+ </select>
+
+
+ <select id="getGrindingOptimize">
+ select
+ CAST(REPLACE(JSON_EXTRACT( oc.config_detail, '$.left_edge' ), '"', '') AS DECIMAL(10,2)) as leftGrind,
+ CAST(REPLACE(JSON_EXTRACT( oc.config_detail, '$.up_edge' ), '"', '') AS DECIMAL(10,2)) as upGrind,
+ CAST(REPLACE(JSON_EXTRACT( oc.config_detail, '$.right_edge' ), '"', '') AS DECIMAL(10,2)) as rightGrind,
+ CAST(REPLACE(JSON_EXTRACT( oc.config_detail, '$.down_edge' ), '"', '') AS DECIMAL(10,2)) as downGrind
+ from pp.optimize_config oc where config_type=4 and creater=#{username}
</select>
<update id="updateOptimizeConfig">
UPDATE pp.optimize_config set config_detail=#{json},create_time=now()
- where config_type=#{type}
+ where config_type=#{type} and creater=#{username}
+ </update>
+ <insert id="insertOptimizeConfig">
+ INSERT INTO pp.optimize_config (
+ config_type,
+ config_name,
+ creater,
+ config_detail,
+ state,
+ create_time
+ ) VALUES (
+ #{type},
+ #{configName},
+ #{userName},
+ #{json},
+ 1,
+ now()
+ )
+ </insert>
+ <update id="updateFlowCardRack">
+ UPDATE pp.flow_card
+ SET rack = #{rackValue}
+ WHERE process_id = #{processId} AND technology_number = #{technologyNumber}
+ </update>
+ <update id="updateNormalDetails">
+ UPDATE pp.optimize_detail
+ SET
+ glass_point = #{detail.glassPoint},
+ x_axis = #{detail.x},
+ y_axis = #{detail.y}
+ WHERE
+ project_no = #{processId} AND polys_id = #{detail.polySort} AND stock_id = #{detail.stockSort}
+ </update>
+ <update id="updateProjectOptimize">
+ update pp.optimize_project as p
+ set p.optimize_state = #{states},
+ p.avg_cut_pct = #{optimalResults.avgCutRate},
+ p.valid_cut_pct = #{optimalResults.validCutRate},
+ p.last_cut_pct = #{optimalResults.lastCutRate},
+ p.raw_stock_qty = #{optimalResults.totalQuantity},
+ p.raw_stock_area = #{totalArea}
+ where p.project_no = #{projectId}
+ </update>
+ <update id="updateProjectTemperingId">
+ UPDATE pp.optimize_detail
+ SET heat_layout_id = NULL,
+ heat_layout_sort = NULL
+ WHERE project_no = #{projectNumber}
</update>
<select id="simulatedTypesettingUsingOpt">
@@ -1052,6 +1628,23 @@
ORDER BY
c.process_id,
c.order_number
+ </select>
+
+ <select id="getFlowCardListSimulated">
+ 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
+ FROM pp.v_optimize_process_normal where
+ CONCAT( JSON_UNQUOTE( JSON_EXTRACT( GlassType, '$.thickness' )), JSON_UNQUOTE( JSON_EXTRACT( GlassType, '$.color' )) )= #{optionVal}
+ order by deliveryDate desc
</select>
@@ -1153,16 +1746,457 @@
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
where project_no = #{projectNumber}
</delete>
+ <delete id="deleteOptimizeOffcut">
+ DELETE
+ FROM
+ pp.optimize_offcut
+ WHERE
+ project_no = #{projectNumber}
+ </delete>
+ <delete id="deleteOffcutDetails">
+ delete from pp.optimize_offcut where project_no = #{processId}
+ </delete>
+ <select id="selectOptimizeProject">
+ select
+ project_no as engineerId,
+ project_name as engineerName,
+ avg_cut_pct as avgAvailability,
+ valid_cut_pct as validAvailability,
+ last_cut_pct as lastAvailability,
+ glass_total as glassTotal,
+ glass_total_area as glassTotalArea,
+ raw_stock_qty as planPatternTotal,
+ raw_stock_area as planPatternTotalArea,
+ glass_thickness as thickness,
+ glass_type as filmsId
+ from
+ pp.optimize_project
+ where
+ project_no = #{projectNo}
+ </select>
+
+ <select id="selectOptimizeLayout">
+ select
+ ol.project_no as engineeringId,
+ op.glass_type as filmsId,
+ ol.realwidth as rawGlassWidth,
+ ol.realheight as rawGlassHeight,
+ op.glass_thickness as rawGlassThickness,
+ ol.stock_id as rawSequence,
+ ol.usage_rate as usageRate
+ from
+ pp.optimize_layout ol
+ left join pp.optimize_project op on ol.project_no = op.project_no
+ where
+ ol.project_no = #{projectNo}
+ order by
+ ol.stock_id
+ </select>
+ <select id="selectOptimizeDetail">
+ select
+ opd.glass_id as glassId,
+ opd.project_no as engineerId,
+ opd.process_id as flowCardId,
+ od.order_id as orderNumber,
+ opd.order_sort as productSortNumber,
+ IF(LOCATE('涓┖', ogd.process ) > 0 and LOCATE('#', pd.separation ),
+ REPLACE(JSON_UNQUOTE(JSON_EXTRACT(pd.separation, "$.lowE")),'#',''),
+ 0) as hollowCombineDirection,
+ opd.o_width as width,
+ opd.o_height as height,
+ op.glass_thickness as thickness,
+ op.glass_type as filmsId,
+ opd.total_layer as totalLayer,
+ opd.layer,
+ opd.stock_id as rawSequence,
+ opd.p_width as edgWidth,
+ opd.p_height as edgHeight,
+ opd.x_axis as xAxis,
+ opd.y_axis as yAxis,
+ if(opd.o_width!=opd.width,1,0) as rawAngle,
+ opd.heat_layout_id as temperingLayoutId,
+ opd.heat_layout_sort as temperingFeedSequence,
+ ohd.x_axis as xCoordinate,
+ ohd.y_axis as yCoordinate,
+ ohd.rotate_angle as angle,
+ IF(LOCATE('涓┖', ogd.process ) > 0 or LOCATE('澶瑰眰', ogd.process ) > 0, 1, 0) as isMultiple,
+ od.width as maxWidth,
+ od.height as maxHeight,
+ opd.mark_icon as markIcon,
+ fc.`merge` as combine,
+ concat( opd.process_id, '/', opd.layer ) as flowCardSequence,
+ ogd.process,
+ if(opd.graph_no=100,0,1) as graphNo
+ from
+ pp.optimize_detail opd
+ left join pp.optimize_project op on op.project_no = opd.project_no
+ left join pp.flow_card fc on opd.process_id = fc.process_id
+ and opd.layer = fc.technology_number
+ and opd.order_sort = order_number
+ left join sd.`order` o on fc.order_id = o.order_id
+ left join sd.order_detail od on fc.order_id = od.order_id
+ and fc.order_number = od.order_number
+ left join sd.order_glass_detail ogd on fc.order_id = ogd.order_id
+ and fc.order_number = ogd.order_number
+ and ogd.technology_number = fc.technology_number
+ left join pp.optimize_heat_detail ohd on ohd.layout_id = opd.heat_layout_id
+ and ohd.sort = opd.heat_layout_sort and ohd.project_no=opd.project_no
+ left join sd.product_detail pd on od.product_id=pd.prod_id and opd.layer=pd.glass_sort
+ where
+ opd.project_no = #{projectNo}
+ </select>
+
+ <select id="selectFlowCardInfoList">
+ select
+ fc.process_id as flowCardId,
+ ogd.child_width as width,
+ ogd.child_height as height,
+ REPLACE (JSON_UNQUOTE( JSON_EXTRACT( pd.separation, '$.thickness' )), 'mm', '' ) as thickness,
+ JSON_UNQUOTE(JSON_EXTRACT( pd.separation, '$.color' )) as filmsId,
+ fc.layers_number as totalLayer,
+ fc.technology_number as layer,
+ fc.quantity as glassTotal,
+ od.order_number as orderNumber,
+ od.product_name as productName,
+ o.customer_name as customerName
+ from
+ pp.flow_card fc
+ left join sd.`order` o on fc.order_id = o.order_id
+ left join sd.order_detail od on fc.order_id = od.order_id
+ and fc.order_number = od.order_number
+ left join sd.order_glass_detail ogd on fc.order_id = ogd.order_id
+ and fc.order_number = ogd.order_number
+ and ogd.technology_number = fc.technology_number
+ left join sd.product p on od.product_id = p.id
+ left join sd.product_detail pd on od.product_id = pd.prod_id
+ and fc.technology_number = pd.glass_sort
+ where
+ project_no =#{projectNo}
+ </select>
+ <select id="getGlassInfo" resultType="java.util.Map">
+ select
+ project_no,
+ glass_type,
+ glass_thickness
+ from
+ pp.optimize_project
+ where
+ project_no = #{projectId}
+ </select>
+ <select id="getOptimizeLayoutsInfo" resultType="java.util.Map">
+ SELECT
+ width,
+ height,
+ realwidth as realWidth,
+ realheight as realHeight,
+ stock_id AS stockId,
+ stock_code AS stockCode,
+ usage_rate AS usageRate,
+ up_trim AS upTrim,
+ down_trim AS downTrim,
+ left_trim AS leftTrim,
+ right_trim AS rightTrim,
+ count AS quantity,
+ glass_count AS glassQuantity
+ FROM
+ pp.optimize_layout
+ where
+ project_no = #{projectId}
+ </select>
+ <select id="getOptimizeDetailsInfo" resultType="java.util.Map">
+ SELECT
+ 0 AS isRemain,
+ od.o_width AS realWidth,
+ od.o_height AS realHeight,
+ od.p_width AS width,
+ od.p_height AS height,
+ od.process_id AS processId,
+ od.layer,
+ od.total_layer AS totalLayer,
+ od.order_sort AS orderSort,
+ od.stock_id AS layoutId,
+ od.stock_number AS glassSort,
+ od.polys_id AS polySort,
+ od.x_axis AS x,
+ od.y_axis AS y,
+ od.mark_icon AS markIcon,
+ od.isRotate,
+ od.glass_point AS glassPoint,
+ fc.order_id AS orderNo,
+ ogd.process,
+ o.customer_name AS customerName,
+ o.processing_note AS processingNote,
+ o.project AS projectName,
+ ord.product_name AS productName,
+ ord.building_number AS buildingNumber,
+# COALESCE(h.layout_id, 0) as heatLayoutId,
+ od.rack_no AS rackNo
+ FROM
+ pp.optimize_detail od
+ LEFT JOIN pp.flow_card fc on (od.process_id = fc.process_id and od.layer = fc.technology_number and od.order_sort = fc.order_number )
+ LEFT JOIN sd.order_glass_detail ogd ON (fc.order_id = ogd.order_id and od.order_sort = ogd.order_number AND ogd.technology_number = fc.technology_number)
+ LEFT JOIN sd.ORDER o ON o.order_id = fc.order_id
+ LEFT JOIN sd.order_detail ord ON (fc.order_id = ord.order_id and od.order_sort = ord.order_number)
+# LEFT JOIN pp.optimize_heat_detail h ON (h.process_id = fc.process_id and od.order_sort = h.sort)
+ WHERE
+ od.project_no = #{projectId}
+ </select>
+ <select id="getOptimizeOffsetsInfo" resultType="java.util.Map">
+ SELECT
+ 1 AS isRemain,
+ 0 AS isRotate,
+ width AS realWidth,
+ height AS realHeight,
+ width AS width,
+ height AS height,
+ stock_id AS stockSort,
+ x_axis AS x,
+ y_axis AS y,
+ model AS glassType,
+ thickness AS glassThickness
+ FROM
+ pp.optimize_offcut
+ WHERE
+ project_no = #{projectId}
+ </select>
+ <select id="getReportDataProcessIdSv" resultType="java.util.Map" parameterType="java.lang.String">
+ SELECT
+ op.project_no as projectId,
+ op.glass_total as rectangleQuantity,
+ '0' as otherShapeQuantity,
+ op.glass_total_area as rectangleArea,
+ '0' as otherShapeArea,
+ '0' as otherShapePerimeter
+ FROM
+ pp.optimize_project as op
+ WHERE
+ op.project_no = #{processId}
+ </select>
+ <select id="getPeriMeterDataSv" resultType="java.util.Map" parameterType="java.lang.String">
+ SELECT
+ od.id,
+ od.project_no,
+ od.p_width,
+ od.p_height,
+ (od.p_width + od.p_height)*2 AS perimeter
+ FROM
+ pp.optimize_detail as od
+ WHERE
+ od.project_no = #{processId}
+ </select>
+ <select id="getMaterialInfoSv" resultType="java.util.Map" parameterType="java.lang.String">
+ SELECT
+ ou.raw_stock_code AS code,
+ ou.use_count AS quantity,
+ ou.width,
+ ou.height,
+ ou.width*ou.height*ou.use_count/1000000.0 as useArea
+ FROM
+ pp.optimize_use ou
+ WHERE
+ ou.project_no = #{processId} and ou.state=1
+ </select>
+ <select id="getProductListSv" resultType="java.util.Map" parameterType="java.lang.String">
+
+ </select>
+ <select id="selectProjectList" resultType="java.util.Map" parameterType="java.lang.String">
+ ( SELECT
+ c.project_no,
+ c.quantity AS quantity,
+ d.child_width AS width,
+ d.child_height AS height,
+ concat( c.process_id, '-', c.technology_number ) AS processCard,
+ round( d.area * c.quantity, 4 ) AS Area,
+ c.order_number
+ FROM
+ pp.flow_card c
+ 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
+ c.project_no IS NOT NULL
+ AND c.project_no = #{processId}
+
+ ORDER BY
+ c.process_id,
+ c.order_number
+ ) UNION
+ (
+ SELECT
+ c.project_no,
+ c.patch_num AS quantity,
+ d.child_width AS width,
+ d.child_height AS height,
+ concat( c.process_id, '-', c.technology_number ) AS processCard,
+ round( d.area * c.patch_num, 4 ) AS Area,
+ c.order_sort
+ FROM
+ pp.patch_log c
+ 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
+ WHERE
+ c.project_no IS NOT NULL
+ AND c.project_no = #{processId}
+
+ ORDER BY
+ c.process_id,
+ c.order_sort)
+ </select>
+ <select id="materialOptimizeUse" resultType="java.util.Map">
+ select ou.raw_stock_code 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_UNQUOTE(JSON_EXTRACT(ms.json, '$.thickness')) AS thickness,
+ JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.name')) AS name,
+ JSON_UNQUOTE(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="getLayoutSetSv" resultType="java.util.Map">
+ SELECT
+ project_no,
+ stock_code as code,
+ realwidth AS width,
+ realheight AS height,
+ usage_rate as usageRate,
+ glass_count as polyQuantity,
+ glass_area AS polyArea
+
+ FROM
+ pp.optimize_layout
+ WHERE
+ project_no = #{processId}
+ </select>
+ <select id="selectConfigByUserAndType" resultType="java.lang.String">
+ SELECT
+ id,
+ config_type,
+ config_detail,
+ creater
+ FROM
+ pp.optimize_config
+ WHERE creater = #{username} AND config_type = #{type}
+ </select>
+ <select id="getGlassProjectList" resultType="java.util.Map" parameterType="java.lang.String">
+ SELECT
+ project_no AS projectId,
+ tempering_state
+ FROM
+ pp.optimize_project
+ WHERE
+ project_no = #{projectId}
+ </select>
+ <select id="getProjectState" resultType="java.util.Map" parameterType="java.lang.String">
+ SELECT
+ project_no,
+ project_name,
+ state,
+ tempering_state,
+ optimize_state
+ FROM
+ pp.optimize_project
+ WHERE
+ project_no = #{projectNo}
+ </select>
+ <select id="optimizeTemp" resultType="java.util.Map" parameterType="java.lang.String">
+ SELECT
+ project_no,
+ layer,
+ o_width as width,
+ o_height as height,
+ rack_no as rackNo,
+ COUNT(*) as quantity,
+ ROUND((o_width + o_height) * 2 / 1000, 2) as perimeter,
+ ROUND(o_width * o_height * COUNT(*) / 1000000, 4) as area
+ FROM
+ pp.`optimize_detail`
+ WHERE
+ project_no = #{projectNo}
+ AND process_id = ''
+ GROUP BY
+ project_no,
+ layer,
+ o_width,
+ o_height,
+ REPLACE(REPLACE(rack_no, '+', ''), '#', '')
+ ORDER BY
+ o_width,
+ o_height
+ </select>
+ <select id="selectTempProject" resultType="java.util.Map" parameterType="java.lang.String">
+ SELECT
+ project_no,
+ o_width as width,
+ o_height as height,
+ rack_no as order_number,
+ layer as processCard,
+ COUNT(*) as quantity,
+ ROUND(o_width * o_height * COUNT(*) / 1000000, 4) as Area
+ FROM
+ pp.`optimize_detail`
+ WHERE
+ project_no = #{processId}
+ AND process_id = ''
+ GROUP BY
+ project_no,
+ layer,
+ o_width,
+ o_height,
+ rack_no
+ ORDER BY
+ o_width,
+ o_height
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0