From 1e1c416c6aa6596feb333b75d882ffeede73d3c9 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 08 四月 2025 17:37:34 +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 | 193 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 183 insertions(+), 10 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 ce0fdb6..6f27e16 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
@@ -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))))
@@ -112,12 +113,21 @@
fc.order_number
</select>
+ <select id="getFlowCardList">
+ SELECT *
+ FROM
+ pp.flow_card AS fc
+ WHERE
+ fc.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,
@@ -133,12 +143,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">
@@ -224,13 +251,58 @@
AND pd.glass_sort = fc.technology_number
WHERE
CONCAT( JSON_UNQUOTE( JSON_EXTRACT( pd.separation, '$.thickness' )), JSON_UNQUOTE( JSON_EXTRACT( pd.separation, '$.color' )) )= #{optionVal}
- and ISNULL(fc.project_no)
+ and ISNULL(fc.project_no) and fc.layout_status=1
GROUP BY
fc.process_id,
fc.technology_number
ORDER BY
fc.process_id,
fc.technology_number
+ </select>
+
+ <select id="getFlowCardListWhole">
+ 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
+ FROM pp.v_optimize_process_whole where
+ CONCAT( JSON_UNQUOTE( JSON_EXTRACT( GlassType, '$.thickness' )), JSON_UNQUOTE( JSON_EXTRACT( GlassType, '$.color' )) )= #{optionVal}
+ </select>
+
+ <select id="getFlowCardListNormal">
+ 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
+ FROM pp.v_optimize_process_normal where
+ CONCAT( JSON_UNQUOTE( JSON_EXTRACT( GlassType, '$.thickness' )), JSON_UNQUOTE( JSON_EXTRACT( GlassType, '$.color' )) )= #{optionVal}
+ </select>
+
+ <select id="getFlowCardListPatch">
+ 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
+ FROM pp.v_optimize_process_patch where
+ CONCAT( JSON_UNQUOTE( JSON_EXTRACT( GlassType, '$.thickness' )), JSON_UNQUOTE( JSON_EXTRACT( GlassType, '$.color' )) )= #{optionVal}
</select>
<!--宸ョ▼绠＄悊-->
@@ -283,16 +355,31 @@
where project_no = #{projectNumber}
</delete>
+ <delete id="deleteOptimizeHeatDetail">
+ delete from pp.optimize_heat_detail
+ where project_no = #{projectNumber}
+ </delete>
+
+ <delete id="deleteOptimizeHeatLayout">
+ delete from pp.optimize_heat_layout
+ where project_no = #{projectNumber}
+ </delete>
+
+ <delete id="deleteOptimizeDetail">
+ delete from pp.optimize_detail
+ where project_no = #{projectNumber}
+ </delete>
+
<select id="getProjectListMp">
SELECT
p.id,
- p.project_no,
+ p.project_no as projectNumber,
p.project_name,
p.glass_type,
p.glass_thickness,
p.type,
p.state,
- p.glass_total,
+ p.glass_total as quantity,
p.glass_total_area,
p.process_qty,
p.process_cards,
@@ -354,6 +441,10 @@
fc.process_id, fc.technology_number;
</select>
+ <select id="selectProjectCount">
+ select * from pp.optimize_project where project_no=#{projectNo}
+ </select>
+
<!--妯℃嫙璁＄畻娴佺▼鍗¤鎯�-->
<select id="selectComputeDetailMp1">
SELECT
@@ -407,6 +498,7 @@
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>
@@ -458,8 +550,13 @@
</select>
<update id="updateFlowCardProject">
- UPDATE pp.flow_card set project_no=#{projectId}
+ UPDATE pp.flow_card set project_no=#{projectId},layout_status=2
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}
</update>
<select id="getSelectArea">
@@ -476,8 +573,10 @@
</select>
<insert id="addProjectMp">
- insert into pp.optimize_project (project_no, project_name, order_glass_type, order_glass_thickness)
- values (#{projectId}, #{projectNmae}, #{glassType}, #{glassThickness})
+ 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)
+ values (#{projectId}, #{projectNmae}, #{glassType}, #{glassThickness}, #{glassType}, #{glassThickness},#{sumQuantity}, #{sumArea},
+ #{type},1,#{processIdCount},#{processId})
</insert>
@@ -528,7 +627,7 @@
);
</foreach>
</insert>
-
+ <!--妯℃嫙璁＄畻缁撴灉淇濆瓨-->
<insert id="addratioResult" parameterType="map">
<foreach collection="projectdetail.data[0].ratioResult" item="glass">
INSERT INTO pp.optimize_heat_layout (
@@ -555,4 +654,78 @@
</foreach>
</insert>
+ <!--妯℃嫙璁＄畻宸ョ▼鏇存柊-->
+ <update id="addratioProjectResult" parameterType="map">
+ UPDATE pp.optimize_project
+ SET
+ state = 10,
+ chaos_pct = #{inputValues.chaos_pct},
+ max_load_pct = #{inputValues.max_load_pct},
+ max_area=#{inputValues.max_area},
+ max_qty=#{inputValues.max_qty},
+ load_width=#{inputValues.load_width},
+ load_length=#{inputValues.load_length},
+ x_space=#{inputValues.x_space},
+ y_space=#{inputValues.y_space},
+ load_rate=#{inputValues.load_rate}
+ WHERE
+ project_no = #{inputValues.project_no}
+
+ </update>
+<!--浼樺寲璁剧疆淇濆瓨-->
+ <update id="optimizeParmsSave">
+ update erp_user_info.user as u
+ set u.optimize_parms = #{jsonString}
+ </update>
+
+ <update id="updateOptimizeResult">
+ update pp.optimize_project_file as u
+ set u.content = #{jsonString}
+ where u.project_no=#{processId} and type='浼樺寲缁撴灉'
+ </update>
+
+
+
+ <select id="selectOptimizeResult">
+ SELECT content as Layouts
+ FROM pp.optimize_project_file
+ WHERE project_no=#{processId} and type='浼樺寲缁撴灉';
+ </select>
+
+ <select id="getTemperedConfiguration">
+ select JSON_EXTRACT( oc.config_detail, '$.glass_thickness' ) as glass_thickness,
+ JSON_EXTRACT( oc.config_detail, '$.glass_type' ) as glass_type,
+ JSON_EXTRACT( oc.config_detail, '$.tempering_time' ) as tempering_time,
+ JSON_EXTRACT( oc.config_detail, '$.load_width' ) as load_width,
+ 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'
+ </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