From 3c55debea2b60faf89acdf89074ffd135dc44d7e Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 08 四月 2025 17:37:19 +0800
Subject: [PATCH] 提交筛选日期调整
---
north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml | 103 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 97 insertions(+), 6 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 c08f739..69d1eab 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
@@ -112,6 +112,15 @@
fc.order_number
</select>
+ <select id="getFlowCardList">
+ SELECT *
+ FROM
+ pp.flow_card AS fc
+ WHERE
+ fc.project_no = #{projectNo}
+
+ </select>
+
<!--搴撳瓨淇℃伅-->
<select id="materialStoreMp">
SELECT
@@ -224,13 +233,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 +337,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,
@@ -352,6 +421,10 @@
fc.process_id, fc.technology_number
ORDER BY
fc.process_id, fc.technology_number;
+ </select>
+
+ <select id="selectProjectCount">
+ select * from pp.optimize_project where project_no=#{projectNo}
</select>
<!--妯℃嫙璁＄畻娴佺▼鍗¤鎯�-->
@@ -459,8 +532,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">
@@ -477,8 +555,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>
@@ -593,4 +673,15 @@
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>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0