From b499a7e1dbcc4b9dbcdcaa46bbf5c24271bf6698 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 11 八月 2025 16:54:05 +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 | 362 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 353 insertions(+), 9 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 70f2b4a..81b7d6e 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
@@ -179,6 +179,73 @@
</select>
+
+ <select id="directOptimization">
+ (SELECT
+ c.project_no,
+ d.child_width as 'width',
+ d.child_height as 'height',
+ c.quantity,
+ 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,
+ 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,
+ 0 as layoutId
+ 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
+ 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,
+ 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,
+ 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,
+ 0 as layoutId
+ 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
+ (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
@@ -240,10 +307,56 @@
</select>
+ <!--浼樺寲鏌ヨ-->
+ <select id="computeAndOptimization">
+ SELECT
+ c.rack AS rackNo,
+ h.layout_id as layoutId,
+ h.width AS width,
+ h.height AS height,
+ count( 1 ) AS quantity,
+ concat( h.process_id, '-', h.layer ) AS processId,
+ h.process_id as process_ids,
+ h.layer,
+ c.layers_number as totalLayer,
+ 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
+ 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
+ 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.heat_layout_id as rackNo,
+ h.rack_no as rackNo,
h.o_width AS width,
h.o_height AS height,
(h.height-h.o_height)/2 as shortGrind1,
@@ -280,14 +393,14 @@
h.project_no =#{projectNo}
GROUP BY
h.project_no,
- h.heat_layout_id,
+ h.rack_no,
h.width,
h.height,
h.process_id,
h.layer,
c.order_number
ORDER BY
- h.heat_layout_id;
+ h.rack_no;
</select>
<!--宸ョ▼淇℃伅娴佺▼鍗�-->
@@ -633,7 +746,7 @@
from pp.optimize_project as p
left join pp.optimize_admin as a on p.creater = a.Id
where (`p`.`state` > 0)
- and (tempering_state>0 or optimize_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}
@@ -1111,14 +1224,17 @@
order_sort,
stock_id,
polys_id,
- o_width,
- o_height,
+ p_width,
+ p_height,
width,
height,
x_axis,
y_axis,
patch_state,
- mark_icon
+ mark_icon,
+ isRotate,
+ glass_point,
+ rack_no
) VALUES (
#{projectId},
#{glass.processId},
@@ -1134,7 +1250,10 @@
#{glass.x},
#{glass.y},
#{glass.patchState},
- #{glass.markIcon}
+ #{glass.markIcon},
+ #{glass.isRotate},
+ #{glass.glassPoint},
+ #{glass.rackNo}
);
</foreach>
</insert>
@@ -1170,6 +1289,7 @@
down_trim,
left_trim,
right_trim,
+ count,
glass_count,
glass_area,
create_time
@@ -1184,7 +1304,8 @@
#{glass.downTrim},
#{glass.leftTrim},
#{glass.rightTrim},
- #{glass.glassCount},
+ #{glass.count},
+ #{glass.glassQuantity},
#{glass.glassArea},
now()
);
@@ -1226,6 +1347,28 @@
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>
@@ -1307,9 +1450,24 @@
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} and creater=#{username}
+ </update>
+ <update id="updateFlowCardRack">
+ UPDATE pp.flow_card
+ SET rack = #{rackValue}
+ WHERE process_id = #{processId} AND technology_number = #{technologyNumber}
</update>
<select id="simulatedTypesettingUsingOpt">
@@ -1505,11 +1663,197 @@
delete from pp.other_flow_card
where project_no = #{projectNumber}
</delete>
+ <delete id="deleteOptimizeOffcut">
+ DELETE
+ FROM
+ pp.optimize_offcut
+ WHERE
+ project_no = #{projectNumber}
+ </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 rawSequence
+ 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,
+ opd.order_sort as orderNumber,
+ 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
+ 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
+ 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,
+ 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,
+ width AS realWidth,
+ height AS realHeight,
+ p_width AS width,
+ p_height AS height,
+ process_id AS processId,
+ layer,
+ total_layer AS totalLayer,
+ order_sort As orderSort,
+ stock_id AS layoutId,
+ stock_number AS glassSort,
+ x_axis AS x,
+ y_axis AS y,
+ mark_icon AS markIcon,
+ isRotate,
+ glass_point AS glassPoint,
+ rack_no As rackNo
+ FROM
+ pp.optimize_detail
+ WHERE
+ 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>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0