From fa3f092ce9824b9a0dddb53dc353cd9f41998bc9 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 12 四月 2024 15:27:46 +0800
Subject: [PATCH] 跨工序次破报表
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/Report.xml b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
index 23d1021..d4a9dcd 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -44,12 +44,28 @@
<result column="total_thickness" property="totalThickness"/>
<result column="thickness" property="thickness"/>
</association>
-
+
<!--<result column="g_typeId" property="glassTypes.typeId"/>
<result column="g_type" property="glassTypes.type"/>-->
-
+
</resultMap>
-
+
+ <resultMap id="damageDetailsTableMap" type="com.example.erp.entity.pp.DamageDetails">
+ <result column="responsible_process" property="responsibleProcess"/>
+ <result column="responsible_team" property="responsibleTeam"/>
+ <result column="breakage_type" property="breakageType"/>
+ <result column="breakage_reason" property="breakageReason"/>
+ <result column="breakage_quantity" property="breakageQuantity"/>
+ <result column="area" property="area"/>
+ <result column="reporting_work_id" property="reportingWork.reportingWorkId"/>
+ <result column="reporting_work_time" property="reportingWork.reportingWorkTime"/>
+ <result column="this_process" property="reportingWork.thisProcess"/>
+ <result column="project" property="order.project"/>
+ <result column="order_id" property="order.orderId"/>
+ <result column="glass_child" property="orderGlassDetail.glassChild"/>
+ </resultMap>
+
+
<!-- 娴佺▼鍗¤繘搴�-->
<select id="processCardProgressMp">
select
@@ -101,10 +117,10 @@
</select>
- <select id="getProcessBreaking" resultMap="flowCardMap">
+ <select id="getProcessBreaking" resultMap="damageDetailsTableMap">
select rw.reporting_work_id,rw.reporting_work_time,dd.responsible_process,dd.responsible_team,
- dd.breakage_type,dd.breakage_reason,ROUND(SUM(dd.breakage_quantity)),
- round(ogd.child_width*ogd.child_height*SUM(dd.breakage_quantity)/1000000,2),rw.this_process,
+ dd.breakage_type,dd.breakage_reason,ROUND((dd.breakage_quantity)) as breakage_quantity,
+ round(ogd.child_width*ogd.child_height*(dd.breakage_quantity)/1000000,2) as area,rw.this_process,
o.project,o.order_id,ogd.glass_child
from
damage_details as dd
@@ -120,7 +136,7 @@
and reviewed_state!=2
and rw.this_process!=dd.responsible_process
GROUP BY dd.id
- order by dd.reporting_work_id desc
+ order by dd.id desc
limit #{offset},#{pageSize}
</select>
--
Gitblit v1.8.0