From c3e3920e4e7fcda3dd986c00bb80188381e93015 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 18 四月 2024 09:59:50 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 106 insertions(+), 0 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 703b4fe..d4a9dcd 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -50,8 +50,114 @@
</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
+ a.product_name,
+ b.glass_child,
+ d.order_type,
+ concat(c.process_id,'/',c.technology_number) as process_id,
+ c.technology_number,
+ c.quantity,
+ e.reportWorkQuantity,
+ e.reportWorkQuantityCount,
+ e.broken_num,
+ round(ifnull(f.inventory,0)*a.area,2) as inventoryArea
+
+ from
+ flow_card as c
+ left join
+ sd.order_detail as a
+ on c.order_id = a.order_id
+ and c.order_number = a.order_number
+ left join sd.order_glass_detail as b
+ on c.order_id = b.order_id
+ and b.order_number = c.order_number
+ and c.technology_number = b.technology_number
+ left join sd.`order` as d
+ on c.order_id = d.order_id
+ left join mm.finished_goods_inventory as f
+ on c.order_id = f.order_id and f.order_number = c.order_number
+ left join (
+ SELECT process_id,
+ technology_number,
+ sum(a.broken_num) as broken_num,
+ concat('{',
+ GROUP_CONCAT(concat("\"",process,"\":\"",reporting_work_num,"\"")),
+ '}'
+ ) as reportWorkQuantity,
+ concat('{',
+ GROUP_CONCAT(concat("\"",process,"\":\"",reporting_work_num_count,"\"")),
+ '}'
+ ) as reportWorkQuantityCount
+ FROM sd.order_process_detail as a
+ where a.order_id=#{orderId}
+ GROUP BY process_id,a.technology_number
+ ) as e
+ on e.process_id = c.process_id
+ and e.technology_number = c.technology_number
+
+ where a.order_id = #{orderId}
</select>
+
+ <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((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
+ left join reporting_work as rw
+ on rw.reporting_work_id=dd.reporting_work_id
+ left join sd.order as o
+ on rw.order_id=o.order_id
+ left join sd.order_glass_detail as ogd
+ on ogd.order_id=o.order_id and ogd.order_number=dd.order_number
+ and ogd.technology_number and dd.technology_number
+ where date(rw.reporting_work_time)>=#{startDate} and date(rw.reporting_work_time) <= #{endDate}
+ and rw.this_worn_quantity>0 and dd.available=0
+ and reviewed_state!=2
+ and rw.this_process!=dd.responsible_process
+ GROUP BY dd.id
+ order by dd.id desc
+ limit #{offset},#{pageSize}
+ </select>
+
+ <select id="getProcessBreakingTotal">
+ select
+ CEILING(count(dd.id)/#{pageSize}) as 'pageTotal',
+ count(distinct dd.id) as 'total'
+ from
+ damage_details as dd
+ left join reporting_work as rw
+ on rw.reporting_work_id=dd.reporting_work_id
+ left join sd.order as o
+ on rw.order_id=o.order_id
+ left join sd.order_glass_detail as ogd
+ on ogd.order_id=o.order_id and ogd.order_number=dd.order_number
+ and ogd.technology_number and dd.technology_number
+ where date(rw.reporting_work_time)>=#{startDate} and date(rw.reporting_work_time) <= #{endDate}
+ and rw.this_worn_quantity>0 and dd.available=0
+ and reviewed_state!=2
+ and rw.this_process!=dd.responsible_process
+ order by dd.id desc
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0