From 763d7cf2f4aed4d21921e08d05b7b121c24ce136 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 21 十一月 2025 07:39:54 +0800
Subject: [PATCH] 解决报工查询班组带括号无法筛选问题
---
north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 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 6a8867d..50e0639 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
@@ -212,6 +212,7 @@
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}
@@ -251,7 +252,8 @@
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 c.order_id = od.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
@@ -580,7 +582,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>
@@ -793,7 +796,9 @@
<!--淇敼妯℃嫙璁＄畻宸ョ▼鐘舵��-->
<update id="updateProjectTemperingStateMp">
update pp.optimize_project as p
- set p.tempering_state = #{states}
+ set p.tempering_state = #{states},
+ p.load_rate = NULL,
+ p.furnaces_qty = NULL
where p.project_no = #{projectNumber}
</update>
@@ -1154,7 +1159,7 @@
NOW(),
NOW(),
0,
- #{glass.layers_number},
+ #{glass.technology_number},
#{glass.order_number},
#{glass.tempering_layout_id},
#{glass.tempering_feed_sequence},
@@ -1558,8 +1563,15 @@
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_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">
@@ -1796,7 +1808,8 @@
ol.realwidth as rawGlassWidth,
ol.realheight as rawGlassHeight,
op.glass_thickness as rawGlassThickness,
- ol.stock_id rawSequence
+ 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
@@ -1808,6 +1821,7 @@
<select id="selectOptimizeDetail">
+
select
opd.glass_id as glassId,
opd.project_no as engineerId,
@@ -1840,7 +1854,8 @@
opd.mark_icon as markIcon,
fc.`merge` as combine,
concat( opd.process_id, '/', opd.layer ) as flowCardSequence,
- ogd.process
+ 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
@@ -2106,6 +2121,18 @@
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>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0