From a04d735ab3f2e9c52ebf52c35dfa1506d86d416d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 24 七月 2025 17:01:57 +0800
Subject: [PATCH] 修改流程卡打印获取第一个工序不正确问题，在制品汇总报表添加批次
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 1604 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 1,439 insertions(+), 165 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 949549f..e0d1dcc 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -50,19 +50,20 @@
</resultMap>
- <resultMap id="damageDetailsTableMap" type="com.example.erp.entity.pp.DamageDetails">
+ <resultMap id="damageDetailsTableMap" type="com.example.erp.dto.pp.CrossProcessBreakingDTO">
<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"/>
+ <result column="reporting_work_time" property="reportingWorkTime"/>
+ <result column="this_process" property="thisProcess"/>
+ <result column="project" property="project"/>
+ <result column="order_id" property="orderId"/>
+ <result column="glass_child" property="glassChild"/>
+ <result column="process_id" property="processId"/>
+ <result column="code" property="code"/>
</resultMap>
@@ -91,6 +92,7 @@
<result column="area" property="area"/>
<result column="breakage_quantity" property="breakageQuantity"/>
<result column="project" property="project"/>
+ <result column="batch" property="batch"/>
<result column="process_id" property="processId"/>
<result column="order_number" property="orderNumber"/>
<result column="technology_number" property="technologyNumber"/>
@@ -101,6 +103,9 @@
<result column="breakage_reason" property="breakageReason"/>
<result column="personnel" property="personnel"/>
<result column="glass_child" property="glassChild"/>
+ <result column="glassNumber" property="glassNumber"/>
+ <result column="child_width" property="childWidth"/>
+ <result column="child_height" property="childHeight"/>
</resultMap>
<resultMap id="teamOutputMap" type="com.example.erp.dto.pp.TeamOutputDTO">
@@ -119,6 +124,11 @@
<result column="area" property="area"/>
<result column="product_name" property="productName"/>
<result column="code" property="code"/>
+ <result column="reviewed" property="reviewed"/>
+ <result column="examine_time" property="examineTime"/>
+ <result column="workProcessName" property="workProcessName"/>
+ <result column="device_name" property="deviceName"/>
+ <result column="order_type" property="orderType"/>
</resultMap>
<resultMap id="scheduleProductionScheduleMap" type="com.example.erp.dto.pp.ScheduleProductionScheduleDTO">
@@ -149,6 +159,8 @@
<result column="stockArea" property="stockArea"/>
<result column="product_name" property="productName"/>
<result column="bend_radius" property="bendRadius"/>
+ <result column="glassNumber" property="glassNumber"/>
+ <result column="teams_groups_name" property="teamsGroupsName"/>
</resultMap>
<!-- 娴佺▼鍗¤繘搴�-->
@@ -159,14 +171,30 @@
concat(c.process_id, '/', c.technology_number) as process_id,
c.order_number,
c.technology_number,
- c.quantity,
+ b.child_width,
+ b.child_height,
+ if(c.technology_number=1,c.quantity,0) as quantity,
+# c.quantity,
+ c.quantity as thisQuantity,/*鐢ㄤ簬鍒ゆ柇鏄惁鏀瑰彉棰滆壊*/
e.reportWorkQuantity,
e.reportWorkQuantityCount,
+ e.reportWorkTime,
e.broken_num,
- ifnull(f.inventory, 0) as inventory,
- round(ifnull(f.inventory, 0) * a.area, 2) as inventoryArea,
- ifnull(dd.quantity, 0) as shippedQuantity
- from flow_card as c
+ c.quantity as glassQuantity,
+
+# c.quantity*a.area as gross_area,
+# ifnull(f.inventory, 0) as inventory,
+# round(ifnull(f.inventory, 0) * a.area, 2) as inventoryArea,
+# ifnull(dd.quantity, 0) as shippedQuantity,
+
+ if(c.technology_number=1,c.quantity*a.area,0) as gross_area,
+ if(c.technology_number=1,ifnull(f.inventory, 0) ,0) as inventory,
+ if(c.technology_number=1,round(ifnull(f.inventory, 0) * a.area, 2),0) as inventoryArea,
+ if(c.technology_number=1,ifnull(dd.quantity, 0) ,0) as shippedQuantity,
+
+
+ ifnull(JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')),'') AS glassNumber
+ from pp.flow_card as c
left join
sd.order_detail as a
on c.order_id = a.order_id
@@ -185,20 +213,29 @@
technology_number,
sum(a.broken_num) as broken_num,
concat('{',
- GROUP_CONCAT(concat("\"", process, "\":\"", reporting_work_num, "\"")),
+ GROUP_CONCAT(concat("\"", process, "\":\"", if(technology_number!=1 and (bd.nickname='stepD' || bd.nickname='stepB' ) ,0,reporting_work_num), "\"")),
'}'
) as reportWorkQuantity,
concat('{',
GROUP_CONCAT(concat("\"", process, "\":\"", reporting_work_num_count, "\"")),
'}'
- ) as reportWorkQuantityCount
+ ) as reportWorkQuantityCount,
+ concat('{',
+ GROUP_CONCAT(concat("\"", process, "\":\"", IFNULL(date(update_time),''), "\"")),
+ '}'
+ ) as reportWorkTime
FROM sd.order_process_detail as a
+ left join (SELECT DISTINCT basic_name,nickname from sd.basic_data as bd where bd.basic_category = 'process') as bd
+ on a.process = bd.basic_name
where a.order_id = #{orderId}
- GROUP BY process_id, a.order_number, a.technology_number) as e
+ GROUP BY process_id, a.order_number, a.technology_number
+
+
+ ) as e
on e.process_id = c.process_id
and e.technology_number = c.technology_number
and e.order_number = c.order_number
- where a.order_id = #{orderId}
+ where a.order_id = #{orderId} and d.create_order>0
group by c.order_number,
c.technology_number,
c.process_id
@@ -218,21 +255,49 @@
o.project,
o.order_id,
ogd.glass_child,
- rw.this_process
- 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
+ rw.this_process,
+ JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code,
+ CONCAT(rw.process_id,'/',GROUP_CONCAT(distinct dd.technology_number SEPARATOR '')) as process_id
+ from
+ sd.`order` as o left join sd.order_detail as od on o.order_id=od.order_id
+ left join sd.order_glass_detail as ogd on ogd.order_id=od.order_id and ogd.order_number=od.order_number
+ left join reporting_work as rw on rw.order_id=o.order_id
+ left join damage_details as dd on dd.reporting_work_id=rw.reporting_work_id and dd.order_number=ogd.order_number
+ and dd.technology_number=ogd.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
+ and o.create_order>0
+ <if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
+ and JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) regexp #{crossProcessBreakingDTO.code}
+ </if>
+ <if test="crossProcessBreakingDTO.processId != null and crossProcessBreakingDTO.processId != ''">
+ and rw.process_id regexp #{crossProcessBreakingDTO.processId}
+ </if>
+ <if test="crossProcessBreakingDTO.thisProcess != null and crossProcessBreakingDTO.thisProcess != ''">
+ and rw.this_process regexp #{crossProcessBreakingDTO.thisProcess}
+ </if>
+ <if test="crossProcessBreakingDTO.responsibleProcess != null and crossProcessBreakingDTO.responsibleProcess != ''">
+ and dd.responsible_process regexp #{crossProcessBreakingDTO.responsibleProcess}
+ </if>
+ <if test="crossProcessBreakingDTO.responsibleTeam != null and crossProcessBreakingDTO.responsibleTeam != ''">
+ and dd.responsible_team regexp #{crossProcessBreakingDTO.responsibleTeam}
+ </if>
+ <if test="crossProcessBreakingDTO.glassChild != null and crossProcessBreakingDTO.glassChild != ''">
+ and ogd.glass_child regexp #{crossProcessBreakingDTO.glassChild}
+ </if>
+ <if test="crossProcessBreakingDTO.breakageType != null and crossProcessBreakingDTO.breakageType != ''">
+ and dd.breakage_type regexp #{crossProcessBreakingDTO.breakageType}
+ </if>
+ <if test="crossProcessBreakingDTO.project != null and crossProcessBreakingDTO.project != ''">
+ and o.project regexp #{crossProcessBreakingDTO.project}
+ </if>
+ <if test="crossProcessBreakingDTO.orderId != null and crossProcessBreakingDTO.orderId != ''">
+ and o.order_id regexp #{crossProcessBreakingDTO.orderId}
+ </if>
GROUP BY dd.id
order by dd.id desc
limit #{offset},#{pageSize}
@@ -255,6 +320,33 @@
and dd.available = 0
and reviewed_state != 2
and rw.this_process != dd.responsible_process
+ <if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
+ and JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) regexp #{crossProcessBreakingDTO.code}
+ </if>
+ <if test="crossProcessBreakingDTO.processId != null and crossProcessBreakingDTO.processId != ''">
+ and rw.process_id regexp #{crossProcessBreakingDTO.processId}
+ </if>
+ <if test="crossProcessBreakingDTO.thisProcess != null and crossProcessBreakingDTO.thisProcess != ''">
+ and rw.this_process regexp #{crossProcessBreakingDTO.thisProcess}
+ </if>
+ <if test="crossProcessBreakingDTO.responsibleProcess != null and crossProcessBreakingDTO.responsibleProcess != ''">
+ and dd.responsible_process regexp #{crossProcessBreakingDTO.responsibleProcess}
+ </if>
+ <if test="crossProcessBreakingDTO.responsibleTeam != null and crossProcessBreakingDTO.responsibleTeam != ''">
+ and dd.responsible_team regexp #{crossProcessBreakingDTO.responsibleTeam}
+ </if>
+ <if test="crossProcessBreakingDTO.glassChild != null and crossProcessBreakingDTO.glassChild != ''">
+ and ogd.glass_child regexp #{crossProcessBreakingDTO.glassChild}
+ </if>
+ <if test="crossProcessBreakingDTO.breakageType != null and crossProcessBreakingDTO.breakageType != ''">
+ and dd.breakage_type regexp #{crossProcessBreakingDTO.breakageType}
+ </if>
+ <if test="crossProcessBreakingDTO.project != null and crossProcessBreakingDTO.project != ''">
+ and o.project regexp #{crossProcessBreakingDTO.project}
+ </if>
+ <if test="crossProcessBreakingDTO.orderId != null and crossProcessBreakingDTO.orderId != ''">
+ and o.order_id regexp #{crossProcessBreakingDTO.orderId}
+ </if>
order by dd.id desc
</select>
@@ -265,7 +357,8 @@
o.project,
o.order_id,
o.batch,
- if(od.shape = 1, '鏅舰', if(od.shape = 2, '寮傚舰', '')) as shape,
+ if(od.shape='' || ISNULL(od.shape),'鏅舰',if(od.shape = 1, '鏅舰', if(od.shape = 2, '寮傚舰', ''))) as shape,
+ if(od.shape=2,JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04')),od.bend_radius) as bend_radius,
ogd.order_number,
ogd.technology_number,
ogd.process,
@@ -278,7 +371,9 @@
(odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
odpd.broken_num) / 1000000, 2) as stockArea,
od.product_name,
- od.bend_radius
+ od.bend_radius,
+ ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') AS glassNumber,
+ rws.teams_groups_name
from sd.order_detail AS od
LEFT JOIN sd.order_glass_detail AS ogd
@@ -314,7 +409,15 @@
and c.technology_number = fc.technology_number
left join sd.`order` as o
on o.order_id = od.order_id
- where LENGTH(fc.process_id) = 14
+ left join
+ (
+ select a.process_id,a.teams_groups_name,a.next_process,b.technology_number,b.order_number
+ from reporting_work as a
+ left join reporting_work_detail as b on a.reporting_work_id=b.reporting_work_id
+ GROUP BY a.process_id,a.teams_groups_name,a.next_process,b.order_number,b.technology_number
+ ) as rws on rws.process_id=fc.process_id and rws.order_number=fc.order_number
+ and rws.technology_number=fc.technology_number and rws.next_process=#{selectProcesses}
+ where o.create_order>0
and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
odpd.broken_num != 0
and odpd.process = #{selectProcesses}
@@ -340,6 +443,9 @@
</if>
<if test="workInProgressDTO.technologyNumber != null and workInProgressDTO.technologyNumber != ''">
and ogd.technology_number regexp #{workInProgressDTO.technologyNumber}
+ </if>
+ <if test="workInProgressDTO.glassNumber != null and workInProgressDTO.glassNumber != ''">
+ and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{workInProgressDTO.glassNumber}
</if>
group by fc.process_id, fc.order_number, fc.technology_number
order by fc.process_id, fc.order_number, fc.technology_number
@@ -384,7 +490,15 @@
and c.technology_number = fc.technology_number
left join sd.`order` as o
on o.order_id = od.order_id
- where LENGTH(fc.process_id) = 14
+ left join
+ (
+ select a.process_id,a.teams_groups_name,a.next_process,b.technology_number,b.order_number
+ from reporting_work as a
+ left join reporting_work_detail as b on a.reporting_work_id=b.reporting_work_id
+ GROUP BY a.process_id,a.teams_groups_name,a.next_process,b.order_number,b.technology_number
+ ) as rws on rws.process_id=fc.process_id and rws.order_number=fc.order_number
+ and rws.technology_number=fc.technology_number and rws.next_process=#{selectProcesses}
+ where o.create_order>0
and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
odpd.broken_num != 0
and odpd.process = #{selectProcesses}
@@ -427,14 +541,14 @@
ogd.glass_child,
ogd.child_width,
ogd.child_height,
- od.quantity,
+ fc.quantity,
ROUND(ogd.child_width * ogd.child_height / 1000000, 2) as childArea,
- ROUND(ogd.child_width * ogd.child_height * od.quantity / 1000000, 2) as actualArea,
+ ROUND(ogd.child_width * ogd.child_height * fc.quantity / 1000000, 2) as actualArea,
odpd.reporting_work_num as completeNum,
ROUND(ogd.child_width * ogd.child_height * odpd.reporting_work_num / 1000000,
2) as completeArea,
- od.quantity - odpd.reporting_work_num as incompleteNum,
- ROUND(ogd.child_width * ogd.child_height * (od.quantity - odpd.reporting_work_num) / 1000000,
+ fc.quantity - odpd.reporting_work_num as incompleteNum,
+ ROUND(ogd.child_width * ogd.child_height * (fc.quantity - odpd.reporting_work_num) / 1000000,
2) as incompleteArea,
od.product_name
@@ -454,12 +568,13 @@
and odpd.process_id = fc.process_id
left join sd.`order` as o
on o.order_id = od.order_id
- where LENGTH(fc.process_id) = 14
+ where o.create_order>0
and odpd.process = #{selectProcesses}
- and o.create_time between #{selectTime1} and #{selectTime2}
+ and o.create_time >= #{selectTime1}
+ AND o.create_time < #{selectTime2}
and position(#{orderId} in od.order_id)
and position(#{inputProject} in o.project)
- and od.quantity > odpd.reporting_work_num
+ and fc.quantity - odpd.reporting_work_num>0
group by fc.process_id, fc.order_number, fc.technology_number
order by fc.process_id, fc.order_number, fc.technology_number
@@ -469,10 +584,11 @@
SELECT
o.order_id,
o.project,
+ o.batch,
rw.process_id,
dd.order_number,
dd.technology_number,
- date(rw.reporting_work_time) as reporting_work_time,
+ rw.reporting_work_time as reporting_work_time,
dd.responsible_process,
dd.responsible_team,
dd.responsible_equipment,
@@ -481,7 +597,10 @@
dd.breakage_quantity,
round( ogd.child_width * ogd.child_height * dd.breakage_quantity / 1000000, 2 ) as area,
IFNULL(dd.responsible_personnel,'') as personnel,
- ogd.glass_child
+ ogd.glass_child,
+ ogd.child_width,
+ ogd.child_height,
+ ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') AS glassNumber
FROM
sd.ORDER AS o
LEFT JOIN sd.order_glass_detail AS ogd ON ogd.order_id = o.order_id
@@ -489,10 +608,12 @@
LEFT JOIN damage_details AS dd ON dd.reporting_work_id = rw.reporting_work_id
AND dd.order_number = ogd.order_number
AND dd.technology_number = ogd.technology_number
+ left join sd.order_detail as od on o.order_id = od.order_id and od.order_number=ogd.order_number
WHERE
- rw.reporting_work_time between #{selectTime1} and #{selectTime2}
- AND dd.available = 0
- AND LENGTH( rw.process_id )= 14
+ rw.reporting_work_time >= #{selectTime1}
+ AND rw.reporting_work_time < #{selectTime2}
+
+ AND dd.available = 0 and rw.reviewed_state>=0
<if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''">
and o.order_id regexp #{damageReportDTO.orderId}
</if>
@@ -522,6 +643,12 @@
</if>
<if test="damageReportDTO.breakageReason != null and damageReportDTO.breakageReason != ''">
and dd.breakage_reason regexp #{damageReportDTO.breakageReason}
+ </if>
+ <if test="damageReportDTO.glassChild != null and damageReportDTO.glassChild != ''">
+ and ogd.glass_child regexp #{damageReportDTO.glassChild}
+ </if>
+ <if test="damageReportDTO.glassNumber != null and damageReportDTO.glassNumber != ''">
+ and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{damageReportDTO.glassNumber}
</if>
GROUP BY
dd.id
@@ -540,9 +667,9 @@
AND dd.order_number = ogd.order_number
AND dd.technology_number = ogd.technology_number
WHERE
- rw.reporting_work_time between #{selectTime1} and #{selectTime2}
+ rw.reporting_work_time >= #{selectTime1}
+ AND rw.reporting_work_time < #{selectTime2}
AND dd.available = 0
- AND LENGTH( rw.process_id )= 14
<if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''">
and o.order_id regexp #{damageReportDTO.orderId}
</if>
@@ -573,7 +700,9 @@
<if test="damageReportDTO.breakageReason != null and damageReportDTO.breakageReason != ''">
and dd.breakage_reason regexp #{damageReportDTO.breakageReason}
</if>
-
+ <if test="damageReportDTO.glassChild != null and damageReportDTO.glassChild != ''">
+ and ogd.glass_child regexp #{damageReportDTO.glassChild}
+ </if>
limit #{offset},#{pageSize};
</select>
@@ -587,17 +716,21 @@
ogd.child_height as childHeight,
fc.quantity,
round(ogd.child_width * ogd.child_height * fc.quantity / 1000000, 2) as area,
- if(od.shape = 1, '鏅舰', if(od.shape = 2, '寮傚舰', '')) as shape,
- od.remarks
- FROM sd.ORDER AS o
- LEFT JOIN sd.order_detail AS od ON od.order_id = od.order_id
- LEFT JOIN sd.order_glass_detail AS ogd ON o.order_id = ogd.order_id
- AND ogd.order_number = od.order_number
- LEFT JOIN flow_card AS fc ON fc.order_id = ogd.order_id
- AND fc.order_number
- AND fc.technology_number = ogd.technology_number
+ if(od.shape='' || ISNULL(od.shape),'鏅舰',if(od.shape = 1, '鏅舰', if(od.shape = 2, '寮傚舰', ''))) as shape,
+ od.remarks,
+ ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') AS glassNumber,
+ JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')) AS S01,
+ JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')) AS S02,
+ JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S03')) AS S03,
+ JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04')) AS S04,
+ JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S05')) AS S05
+ FROM
+ flow_card as fc left join sd.order_glass_detail as ogd on ogd.order_id=fc.order_id and ogd.order_number=ogd.order_number and ogd.technology_number=fc.technology_number
+ left join sd.order_detail as od on od.order_id=fc.order_id and od.order_number=fc.order_number
+ left join sd.`order` as o on o.order_id=fc.order_id
WHERE fc.order_id = #{orderId}
GROUP BY fc.id
+ order by fc.order_number,fc.technology_number
</select>
<select id="qualityReportMp">
@@ -633,8 +766,8 @@
AND opd.order_number = fc.order_number
AND opd.technology_number = fc.technology_number
- WHERE o.create_time BETWEEN #{selectTime1} and #{selectTime2}
-
+ WHERE DATE_FORMAT((o.create_time), '%Y-%m-%d') BETWEEN #{selectTime1} and #{selectTime2}
+ and o.create_order>0
GROUP BY o.order_id,
fc.order_number,
fc.technology_number
@@ -664,14 +797,15 @@
AND opd.order_number = fc.order_number
AND opd.technology_number = fc.technology_number
WHERE opd.reporting_work_num > 0
- and o.create_time BETWEEN #{selectTime1} and #{selectTime2}
+ and o.create_order>0
+ and DATE_FORMAT((o.create_time), '%Y-%m-%d') BETWEEN #{selectTime1} and #{selectTime2}
AND position(#{selectProcesses} IN opd.process)
GROUP BY opd.process, o.order_id
</select>
<select id="productionScheduleMp">
select a.order_number,
- if(a.shape = 1, '鏅舰', if(a.shape = 2, '寮傚舰', '')) as shape,
+ if(a.shape='' || ISNULL(a.shape),'鏅舰',if(a.shape = 1, '鏅舰', if(a.shape = 2, '寮傚舰', ''))) as shape,
a.product_name,
b.child_width,
b.child_height,
@@ -683,7 +817,8 @@
ifnull(f.inventory, 0) as inventoryNum,
round(ifnull(f.inventory, 0) * a.area, 2) as inventoryArea,
ifnull(dd.quantity, 0) as shippedQuantity,
- ifnull(dd.area, 0) as area
+ ifnull(dd.area, 0) as area,
+ ifnull(JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')),'') AS glassNumber
from flow_card as c
left join
@@ -699,6 +834,7 @@
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,
+ order_number,
technology_number,
sum(a.broken_num) as broken_num,
concat('{',
@@ -706,16 +842,18 @@
'}'
) as reportWorkQuantity,
concat('{',
- GROUP_CONCAT(concat("\"", process, "\":\"", reporting_work_num, "\"")),
+ 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
+ GROUP BY process_id, a.order_number,a.technology_number) as e
on e.process_id = c.process_id
+ and e.order_number=c.order_number
and e.technology_number = c.technology_number
left join sd.delivery_detail as dd on dd.order_id = a.order_id and dd.order_number = a.order_number
- where a.order_id = #{orderId}
+ where a.order_id = #{orderId} and d.create_order>0
+ group by c.order_number,c.technology_number
ORDER BY a.order_number
</select>
@@ -756,12 +894,17 @@
) as reportWorkQuantityCount
FROM sd.order_process_detail as a
left join sd.`order` as o on o.order_id = a.order_id
- where o.create_time BETWEEN #{selectTime1} and #{selectTime2}
+ where o.create_time >= #{selectTime1}
+ AND o.create_time < #{selectTime2}
+ and position(#{orderId} in o.order_id)
GROUP BY process_id, a.technology_number) as e
on e.process_id = c.process_id
and e.technology_number = c.technology_number
left join sd.delivery_detail as dd on dd.order_id = a.order_id and dd.order_number = a.order_number
- where d.create_time BETWEEN #{selectTime1} and #{selectTime2}
+ where d.create_time >= #{selectTime1}
+ AND d.create_time < #{selectTime2}
+ and position(#{orderId} in a.order_id)
+ and d.create_order>0
and reportWorkQuantity is not null
GROUP BY a.order_id
ORDER BY a.order_id
@@ -790,20 +933,34 @@
FROM sd.`order` AS a
LEFT JOIN reporting_work AS b ON a.order_id = b.order_id
WHERE b.this_process = '鍒囧壊'
- AND a.create_time BETWEEN #{selectTime1} and #{selectTime2}
+ and a.create_time >= #{selectTime1}
+ AND a.create_time < #{selectTime2}
GROUP BY a.order_id) AS orw ON orw.order_id = o.order_id
LEFT JOIN (SELECT a.order_id,
SUM(b.reporting_work_num) AS completionsNum
FROM sd.`order` AS a
LEFT JOIN sd.order_process_detail AS b ON a.order_id = b.order_id
WHERE b.process = '鍖呰'
- AND a.create_time BETWEEN #{selectTime1} and #{selectTime2}
+ and a.create_time >= #{selectTime1}
+ AND a.create_time < #{selectTime2}
GROUP BY a.order_id) AS oopd ON oopd.order_id = o.order_id
LEFT JOIN reporting_work AS rw ON rw.order_id = fc.order_id
AND rw.process_id = fc.process_id
- WHERE o.create_time BETWEEN #{selectTime1} and #{selectTime2}
+ WHERE o.create_time >= #{selectTime1}
+ AND o.create_time < #{selectTime2}
+ and o.create_order>0
AND fc.create_time IS NOT NULL
GROUP BY o.order_id
+ </select>
+
+ <select id="orderReportingWorks">
+ SELECT *
+ from sd.order_process_detail opd left join sd.`order` o on o.order_id=opd.order_id
+ where o.create_time >= #{selectTime1}
+ and o.create_time < #{selectTime2}
+ and opd.reporting_work_num_count>0
+ group by opd.order_id
+ order by opd.order_id
</select>
<select id="rawMaterialRequisitionMp">
@@ -821,7 +978,7 @@
LEFT JOIN optimize_use AS ou ON modl.use_id = ou.id and ou.raw_stock_code = modl.inventory_id
LEFT JOIN flow_card AS fc ON ou.project_no = fc.project_no
where modl.use_id IS NOT NULL
- and mo.material_requisition_date BETWEEN #{selectTime1} and #{selectTime2}
+ and DATE_FORMAT((mo.material_requisition_date), '%Y-%m-%d') BETWEEN #{selectTime1} and #{selectTime2}
GROUP BY ou.width, ou.height, material_code
</select>
@@ -859,6 +1016,7 @@
<select id="exportDamageReportMp">
SELECT o.order_id,
o.project,
+ o.batch,
rw.process_id,
dd.order_number,
dd.technology_number,
@@ -871,17 +1029,18 @@
dd.breakage_quantity,
round(ogd.child_width * ogd.child_height * dd.breakage_quantity / 1000000, 2) as area,
IFNULL(dd.responsible_personnel, '') as personnel,
- ogd.glass_child
+ ogd.glass_child,
+ ogd.child_width,
+ ogd.child_height
FROM sd.ORDER AS o
LEFT JOIN sd.order_glass_detail AS ogd ON ogd.order_id = o.order_id
LEFT JOIN reporting_work AS rw ON rw.order_id = o.order_id
LEFT JOIN damage_details AS dd ON dd.reporting_work_id = rw.reporting_work_id
AND dd.order_number = ogd.order_number
AND dd.technology_number = ogd.technology_number
- WHERE date(rw.reporting_work_time) >= #{dates[0]}
- and date(rw.reporting_work_time) <= #{dates[1]}
- AND dd.available = 0
- AND LENGTH(rw.process_id) = 14
+ WHERE rw.reporting_work_time >= #{dates[0]}
+ and rw.reporting_work_time <= #{dates[1]}
+ AND dd.available = 0 and rw.reviewed_state>=0
GROUP BY dd.id
</select>
@@ -924,6 +1083,7 @@
AND rw.process_id = fc.process_id
WHERE date(o.create_time) >= #{dates[0]}
and date(o.create_time) <= #{dates[1]}
+ and o.create_order>0
AND fc.create_time IS NOT NULL
GROUP BY o.order_id
</select>
@@ -968,7 +1128,7 @@
and odpd.process_id = fc.process_id
left join sd.`order` as o
on o.order_id = od.order_id
- where LENGTH(fc.process_id) = 14
+ where o.create_order>0
and odpd.process = #{process}
and date(o.create_time) >= #{date[0]}
and date(o.create_time) <= #{date[1]}
@@ -981,13 +1141,13 @@
</select>
<select id="exportWorkInProgressMp">
- select #{process} as thisProcess,
+ select if(#{process}='',odpd.process,#{process}) as thisProcess,
fc.process_id,
o.customer_name,
o.project,
o.order_id,
o.batch,
- if(od.shape = 1, '鏅舰', if(od.shape = 2, '寮傚舰', '')) as shape,
+ if(od.shape='' || ISNULL(od.shape),'鏅舰',if(od.shape = 1, '鏅舰', if(od.shape = 2, '寮傚舰', ''))) as shape,
ogd.order_number,
ogd.technology_number,
ogd.process,
@@ -995,12 +1155,13 @@
ogd.child_width,
ogd.child_height,
odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
- odpd.broken_num as stockNum,
+ odpd.broken_num as stockNum,
ROUND(ogd.child_width * ogd.child_height *
(odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
- odpd.broken_num) / 1000000, 2) as stockArea,
+ odpd.broken_num) / 1000000, 2) as stockArea,
od.product_name,
- od.bend_radius
+ od.bend_radius,
+ ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') AS glassNumber
from sd.order_detail AS od
LEFT JOIN sd.order_glass_detail AS ogd
@@ -1020,7 +1181,7 @@
ON odpds.id = odpd.id - 1
left join
(SELECT sum(rw.rework_num) as 'patchNumSum',
- rw.process_id,
+ rw.process_id,
rw.order_sort,
rw.technology_number,
rwk.this_process
@@ -1028,7 +1189,7 @@
LEFT JOIN
reporting_work as rwk
on rw.reporting_work_id = rwk.reporting_work_id
- where rwk.this_process = #{process}
+ where position(#{process} in rwk.this_process)
and rw.review_status >= 0
GROUP BY rw.process_id, rw.order_sort, rw.technology_number) as c
on c.process_id = fc.process_id
@@ -1036,16 +1197,14 @@
and c.technology_number = fc.technology_number
left join sd.`order` as o
on o.order_id = od.order_id
- where LENGTH(fc.process_id) = 14
+ where o.create_order>0
and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
- odpd.broken_num != 0
- and odpd.process = #{process}
- and date(o.create_time) >= #{date[0]}
- and date(o.create_time) <= #{date[1]}
+ odpd.broken_num != 0 and odpd.process!=SUBSTRING_INDEX(ogd.process, '->', 1)
+ and position(#{process} in odpd.process)
and position(ifnull(#{inputVal}, '') in od.order_id)
and position(ifnull(#{project}, '') in o.project)
- group by fc.process_id, fc.order_number, fc.technology_number
+ group by fc.process_id, fc.order_number, fc.technology_number,odpd.process
order by fc.process_id, fc.order_number, fc.technology_number
</select>
@@ -1095,6 +1254,7 @@
where d.create_time
and date(o.create_time) >= #{dates[0]}
and date(o.create_time) <= #{dates[1]}
+ and d.create_order>0
and reportWorkQuantity is not null
GROUP BY a.order_id
ORDER BY a.order_id
@@ -1155,6 +1315,7 @@
WHERE date(o.create_time) >= #{dates[0]}
and date(o.create_time) <= #{dates[1]}
+ and o.create_order>0
GROUP BY o.order_id,
fc.order_number,
fc.technology_number
@@ -1186,6 +1347,7 @@
WHERE opd.reporting_work_num > 0
and date(o.create_time) >= #{date[0]}
and date(o.create_time) <= #{date[1]}
+ and o.create_order>0
AND position(#{process} IN opd.process)
GROUP BY opd.process, o.order_id
</select>
@@ -1197,41 +1359,33 @@
rw.teams_groups_name,
o.project,
rw.process_id,
- rwd.order_number,
+ fc.order_number,
MAX( ogd.child_width ) as width,
MAX( ogd.child_height ) as height,
- if(od.shape=1,'鏅舰',if(od.shape=2,'寮傚舰','')) as shape,
- sum( pd.thickness ) as thickness,
od.edging_type,
- opd.reporting_work_num as completed_quantity,
- ROUND(MAX( ogd.child_width )*MAX( ogd.child_height )*opd.reporting_work_num/1000000,2) as area,
+ rwd.completed_quantity as completed_quantity,
+ ROUND(MAX( ogd.child_width )*MAX( ogd.child_height )*rwd.completed_quantity/1000000,2) as area,
od.product_name,
- JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code
+ JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code,
+ rw.reviewed,
+ rw.examine_time,
+ rw.device_name,
+ o.order_type,
+-- GROUP_CONCAT(ogd.glass_child SEPARATOR '+') as workProcessName
+ CASE
+ WHEN LOCATE('step',#{laminating})>0 THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
+ ELSE MAX( ogd.glass_child )
+ END AS workProcessName,
+ o.batch
FROM
- reporting_work AS rw
- LEFT JOIN reporting_work_detail AS rwd ON rw.reporting_work_id = rwd.reporting_work_id
- LEFT JOIN sd.`order` AS o ON o.order_id = rw.order_id
- LEFT JOIN sd.order_detail AS od ON od.order_id = o.order_id
- AND od.order_number = rwd.order_number
- LEFT JOIN sd.order_glass_detail AS ogd ON ogd.order_id = o.order_id
- AND ogd.order_number = rwd.order_number
- AND ogd.technology_number = rwd.technology_number
- AND ogd.order_number = od.order_number
- LEFT JOIN (
- SELECT
- prod_id,
- glass_sort,
- REPLACE ( JSON_UNQUOTE( JSON_EXTRACT( separation, '$.thickness' )), 'mm', '' ) AS thickness
- FROM
- sd.product_detail
- WHERE
- detail_type = "glass"
- ) AS pd ON pd.prod_id = od.product_id AND pd.glass_sort = rwd.technology_number
- LEFT JOIN sd.order_process_detail AS opd ON opd.order_id = o.order_id
- AND opd.process_id = rw.process_id
- AND opd.order_number = ogd.order_number
- AND opd.technology_number = ogd.technology_number
- where opd.reporting_work_num > 0 and rw.reviewed_state=1 and rw.reporting_work_time between #{selectTime1} and #{selectTime2}
+ reporting_work as rw left join reporting_work_detail as rwd on rwd.reporting_work_id=rw.reporting_work_id
+ left join flow_card as fc on fc.order_id=rw.order_id and fc.process_id=rw.process_id and fc.order_number=rwd.order_number and fc.technology_number=rwd.technology_number
+ left join sd.order_glass_detail as ogd on ogd.order_id=fc.order_id and ogd.order_number=fc.order_number and ogd.technology_number=fc.technology_number
+ left join sd.order_detail as od on od.order_id=ogd.order_id and od.order_number=ogd.order_number
+ left join sd.`order` as o on o.order_id=od.order_id
+ where o.create_order>0 and rw.reviewed_state>=0 and rwd.completed_quantity>0 and
+ rw.reporting_work_time >= #{selectTime1}
+ AND rw.reporting_work_time < #{selectTime2}
and position(#{selectProcesses} in rw.this_process)
<if test="teamOutputDTO.thisProcess != null and teamOutputDTO.thisProcess != ''">
and rw.this_process regexp #{teamOutputDTO.thisProcess}
@@ -1245,18 +1399,36 @@
<if test="teamOutputDTO.processId != null and teamOutputDTO.processId != ''">
and rw.process_id regexp #{teamOutputDTO.processId}
</if>
- <if test="teamOutputDTO.thickness != null and teamOutputDTO.thickness != ''">
- and thickness regexp #{teamOutputDTO.thickness}
- </if>
<if test="teamOutputDTO.edgingType != null and teamOutputDTO.edgingType != ''">
and od.edging_type regexp #{teamOutputDTO.edgingType}
</if>
+ <if test="teamOutputDTO.deviceName != null and teamOutputDTO.deviceName != ''">
+ and rw.device_name regexp #{teamOutputDTO.deviceName}
+ </if>
- GROUP BY
- rw.this_process,
- rw.teams_groups_name,
- rw.process_id,
- rwd.order_number
+ <choose>
+ <when test="laminating == ''">
+ GROUP BY
+ rw.reporting_work_id,
+ rw.process_id,
+ rw.this_process,
+ rw.teams_groups_name,
+ rwd.order_number,
+ rwd.technology_number
+ </when>
+ <otherwise>
+ GROUP BY
+ <if test="laminating == 'stepA' || laminating == 'stepC'" >
+ ogd.`group`,
+ </if>
+ rw.reporting_work_id,
+ rw.process_id,
+ rw.this_process,
+ rw.teams_groups_name,
+ rwd.order_number
+
+ </otherwise>
+ </choose>
ORDER BY
rw.this_process,
rw.process_id,
@@ -1266,35 +1438,99 @@
limit #{offset},#{pageSize};
</select>
+ <select id="exportTeamOutputMp">
+ SELECT
+ rw.reporting_work_time,
+ rw.this_process,
+ rw.teams_groups_name,
+ o.project,
+ rw.process_id,
+ fc.order_number,
+ MAX( ogd.child_width ) as width,
+ MAX( ogd.child_height ) as height,
+ od.edging_type,
+ rwd.completed_quantity as completed_quantity,
+ ROUND(MAX( ogd.child_width )*MAX( ogd.child_height )*rwd.completed_quantity/1000000,2) as area,
+ od.product_name,
+ JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code,
+ rw.reviewed,
+ rw.examine_time,
+ rw.device_name,
+ -- GROUP_CONCAT(ogd.glass_child SEPARATOR '+') as workProcessName
+ CASE
+ WHEN LOCATE('step',#{laminating})>0 THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
+ ELSE MAX( ogd.glass_child )
+ END AS workProcessName,
+ o.batch
+ FROM
+ reporting_work as rw left join reporting_work_detail as rwd on rwd.reporting_work_id=rw.reporting_work_id
+ left join flow_card as fc on fc.order_id=rw.order_id and fc.process_id=rw.process_id and fc.order_number=rwd.order_number and fc.technology_number=rwd.technology_number
+ left join sd.order_glass_detail as ogd on ogd.order_id=fc.order_id and ogd.order_number=fc.order_number and ogd.technology_number=fc.technology_number
+ left join sd.order_detail as od on od.order_id=ogd.order_id and od.order_number=ogd.order_number
+ left join sd.`order` as o on o.order_id=od.order_id
+ where o.create_order>0 and rw.reviewed_state>=0 and rwd.completed_quantity>0 and
+ rw.reporting_work_time >= #{date[0]}
+ AND rw.reporting_work_time < #{date[1]}
+ and position(#{process} in rw.this_process)
+ <choose>
+ <when test="laminating == ''">
+ GROUP BY
+ rw.reporting_work_id,
+ rw.process_id,
+ rw.this_process,
+ rw.teams_groups_name,
+ rwd.order_number,
+ rwd.technology_number
+ </when>
+ <otherwise>
+ GROUP BY
+ <if test="laminating == 'stepA' || laminating == 'stepC'" >
+ ogd.`group`,
+ </if>
+ rw.reporting_work_id,
+ rw.process_id,
+ rw.this_process,
+ rw.teams_groups_name,
+ rwd.order_number
+ </otherwise>
+ </choose>
+ ORDER BY
+ rw.this_process,
+ rw.process_id,
+ rwd.order_number,
+ rw.reporting_work_time,
+ rw.teams_groups_name
+ </select>
+
<select id="teamOutputPageTotal">
SELECT
- CEILING(count(rwd.id)/#{pageSize}) as 'pageTotal',
- count(distinct rwd.id) as 'total'
+ CEILING(count(*)/#{pageSize}) as 'pageTotal',
+ count(*) as 'total'
FROM
- reporting_work AS rw
- LEFT JOIN reporting_work_detail AS rwd ON rw.reporting_work_id = rwd.reporting_work_id
- LEFT JOIN sd.`order` AS o ON o.order_id = rw.order_id
- LEFT JOIN sd.order_detail AS od ON od.order_id = o.order_id
- AND od.order_number = rwd.order_number
- LEFT JOIN sd.order_glass_detail AS ogd ON ogd.order_id = o.order_id
- AND ogd.order_number = rwd.order_number
- AND ogd.technology_number = rwd.technology_number
- AND ogd.order_number = od.order_number
- LEFT JOIN (
+ (
SELECT
- prod_id,
- glass_sort,
- REPLACE ( JSON_UNQUOTE( JSON_EXTRACT( separation, '$.thickness' )), 'mm', '' ) AS thickness
+ rw.reporting_work_time,
+ rw.this_process,
+ rw.teams_groups_name,
+ o.project,
+ rw.process_id,
+ fc.order_number,
+ MAX( ogd.child_width ) as width,
+ MAX( ogd.child_height ) as height,
+ od.edging_type,
+ rwd.completed_quantity as completed_quantity,
+ ROUND(MAX( ogd.child_width )*MAX( ogd.child_height )*rwd.completed_quantity/1000000,2) as area,
+ od.product_name,
+ JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code
FROM
- sd.product_detail
- WHERE
- detail_type = "glass"
- ) AS pd ON pd.prod_id = od.product_id AND pd.glass_sort = rwd.technology_number
- LEFT JOIN sd.order_process_detail AS opd ON opd.order_id = o.order_id
- AND opd.process_id = rw.process_id
- AND opd.order_number = ogd.order_number
- AND opd.technology_number = ogd.technology_number
- where opd.reporting_work_num > 0 and rw.reviewed_state=1 and rw.reporting_work_time between #{selectTime1} and #{selectTime2}
+ reporting_work as rw left join reporting_work_detail as rwd on rwd.reporting_work_id=rw.reporting_work_id
+ left join flow_card as fc on fc.order_id=rw.order_id and fc.process_id=rw.process_id and fc.order_number=rwd.order_number and fc.technology_number=rwd.technology_number
+ left join sd.order_glass_detail as ogd on ogd.order_id=fc.order_id and ogd.order_number=fc.order_number and ogd.technology_number=fc.technology_number
+ left join sd.order_detail as od on od.order_id=ogd.order_id and od.order_number=ogd.order_number
+ left join sd.`order` as o on o.order_id=od.order_id
+ where o.create_order>0 and rw.reviewed_state>=0 and rwd.completed_quantity>0 and
+ rw.reporting_work_time >= #{selectTime1}
+ AND rw.reporting_work_time < #{selectTime2}
and position(#{selectProcesses} in rw.this_process)
<if test="teamOutputDTO.thisProcess != null and teamOutputDTO.thisProcess != ''">
and rw.this_process regexp #{teamOutputDTO.thisProcess}
@@ -1308,14 +1544,37 @@
<if test="teamOutputDTO.processId != null and teamOutputDTO.processId != ''">
and rw.process_id regexp #{teamOutputDTO.processId}
</if>
- <if test="teamOutputDTO.thickness != null and teamOutputDTO.thickness != ''">
- and thickness regexp #{teamOutputDTO.thickness}
- </if>
<if test="teamOutputDTO.edgingType != null and teamOutputDTO.edgingType != ''">
and od.edging_type regexp #{teamOutputDTO.edgingType}
</if>
- limit #{offset},#{pageSize};
+ <choose>
+ <when test="laminating == ''">
+ GROUP BY
+ rw.reporting_work_id,
+ rw.process_id,
+ rw.this_process,
+ rw.teams_groups_name,
+ rwd.order_number,
+ rwd.technology_number
+ </when>
+ <otherwise>
+ GROUP BY
+ rw.reporting_work_id,
+ rw.process_id,
+ rw.this_process,
+ rw.teams_groups_name,
+ rwd.order_number
+ </otherwise>
+ </choose>
+ ORDER BY
+ rw.this_process,
+ rw.process_id,
+ rwd.order_number,
+ rw.reporting_work_time,
+ rw.teams_groups_name
+ ) as page_toal
+ limit #{offset},#{pageSize}
</select>
<select id="workInProgressOrderMp" resultMap="workInProgressMap">
@@ -1324,14 +1583,15 @@
o.project,
o.order_id,
o.batch,
- if(od.shape = 1, '鏅舰', if(od.shape = 2, '寮傚舰', '')) as shape,
+ if(od.shape='' || ISNULL(od.shape),'鏅舰',if(od.shape = 1, '鏅舰', if(od.shape = 2, '寮傚舰', ''))) as shape,
sum(od.quantity) as quantity,
sum(odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
odpd.broken_num) as stockNum,
sum(ROUND(ogd.child_width * ogd.child_height *
(odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
odpd.broken_num) / 1000000, 2)) as stockArea,
- od.product_name
+ od.product_name,
+ rws.teams_groups_name
from sd.order_detail AS od
LEFT JOIN sd.order_glass_detail AS ogd
@@ -1367,7 +1627,15 @@
and c.technology_number = fc.technology_number
left join sd.`order` as o
on o.order_id = od.order_id
- where LENGTH(fc.process_id) = 14
+ left join
+ (
+ select a.process_id,a.teams_groups_name,a.next_process,b.technology_number,b.order_number
+ from reporting_work as a
+ left join reporting_work_detail as b on a.reporting_work_id=b.reporting_work_id
+ GROUP BY a.process_id,a.teams_groups_name,a.next_process,b.order_number,b.technology_number
+ ) as rws on rws.process_id=fc.process_id and rws.order_number=fc.order_number
+ and rws.technology_number=fc.technology_number and rws.next_process=#{selectProcesses}
+ where o.create_order>0
and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
odpd.broken_num != 0
and odpd.process = #{selectProcesses}
@@ -1428,7 +1696,15 @@
and c.technology_number = fc.technology_number
left join sd.`order` as o
on o.order_id = od.order_id
- where LENGTH(fc.process_id) = 14
+ left join
+ (
+ select a.process_id,a.teams_groups_name,a.next_process,b.technology_number,b.order_number
+ from reporting_work as a
+ left join reporting_work_detail as b on a.reporting_work_id=b.reporting_work_id
+ GROUP BY a.process_id,a.teams_groups_name,a.next_process,b.order_number,b.technology_number
+ ) as rws on rws.process_id=fc.process_id and rws.order_number=fc.order_number
+ and rws.technology_number=fc.technology_number and rws.next_process=#{selectProcesses}
+ where o.create_order>0
and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
odpd.broken_num != 0
and odpd.process = #{selectProcesses}
@@ -1456,14 +1732,15 @@
o.order_id,
fc.process_id,
o.batch,
- if(od.shape = 1, '鏅舰', if(od.shape = 2, '寮傚舰', '')) as shape,
+ if(od.shape='' || ISNULL(od.shape),'鏅舰',if(od.shape = 1, '鏅舰', if(od.shape = 2, '寮傚舰', ''))) as shape,
sum(od.quantity) as quantity,
sum(odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
odpd.broken_num) as stockNum,
sum(ROUND(ogd.child_width * ogd.child_height *
(odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
odpd.broken_num) / 1000000, 2)) as stockArea,
- od.product_name
+ od.product_name,
+ rws.teams_groups_name
from sd.order_detail AS od
LEFT JOIN sd.order_glass_detail AS ogd
@@ -1499,7 +1776,15 @@
and c.technology_number = fc.technology_number
left join sd.`order` as o
on o.order_id = od.order_id
- where LENGTH(fc.process_id) = 14
+ left join
+ (
+ select a.process_id,a.teams_groups_name,a.next_process,b.technology_number,b.order_number
+ from reporting_work as a
+ left join reporting_work_detail as b on a.reporting_work_id=b.reporting_work_id
+ GROUP BY a.process_id,a.teams_groups_name,a.next_process,b.order_number,b.technology_number
+ ) as rws on rws.process_id=fc.process_id and rws.order_number=fc.order_number
+ and rws.technology_number=fc.technology_number and rws.next_process=#{selectProcesses}
+ where o.create_order>0
and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
odpd.broken_num != 0
and odpd.process = #{selectProcesses}
@@ -1563,7 +1848,15 @@
and c.technology_number = fc.technology_number
left join sd.`order` as o
on o.order_id = od.order_id
- where LENGTH(fc.process_id) = 14
+ left join
+ (
+ select a.process_id,a.teams_groups_name,a.next_process,b.technology_number,b.order_number
+ from reporting_work as a
+ left join reporting_work_detail as b on a.reporting_work_id=b.reporting_work_id
+ GROUP BY a.process_id,a.teams_groups_name,a.next_process,b.order_number,b.technology_number
+ ) as rws on rws.process_id=fc.process_id and rws.order_number=fc.order_number
+ and rws.technology_number=fc.technology_number and rws.next_process=#{selectProcesses}
+ where o.create_order>0
and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
odpd.broken_num != 0
and odpd.process = #{selectProcesses}
@@ -1600,8 +1893,8 @@
where processes = #{processes}
GROUP BY order_id, order_number) as ps
left join sd.`order` as o on o.order_id = ps.order_id
- where ps.processes = #{processes}
- and ps.scheduled_start_time between #{selectTime1} and #{selectTime2}
+ where ps.processes = #{processes} and o.create_order>0
+ and DATE_FORMAT((ps.scheduled_start_time), '%Y-%m-%d') between #{selectTime1} and #{selectTime2}
<if test="scheduleProductionScheduleDTO.orderId != null and scheduleProductionScheduleDTO.orderId != ''">
and ps.order_id regexp #{scheduleProductionScheduleDTO.orderId}
</if>
@@ -1626,8 +1919,8 @@
where processes = #{processes}
GROUP BY order_id, order_number) as ps
left join sd.`order` as o on o.order_id = ps.order_id
- where ps.processes = #{processes}
- and ps.scheduled_start_time between #{selectTime1} and #{selectTime2}
+ where ps.processes = #{processes} and o.create_order>0
+ and DATE_FORMAT((ps.scheduled_start_time), '%Y-%m-%d') between #{selectTime1} and #{selectTime2}
<if test="scheduleProductionScheduleDTO.orderId != null and scheduleProductionScheduleDTO.orderId != ''">
and ps.order_id regexp #{scheduleProductionScheduleDTO.orderId}
</if>
@@ -1656,9 +1949,990 @@
where processes = #{process}
GROUP BY order_id, order_number) as ps
left join sd.`order` as o on o.order_id = ps.order_id
- where ps.processes = #{process}
+ where ps.processes = #{process} and o.create_order>0
and date(scheduled_start_time) >= #{date[0]}
and date(scheduled_start_time) <= #{date[1]}
GROUP BY ps.order_id, ps.processes
</select>
+
+ <select id="workInProgressOrderFootSum">
+ SELECT SUM(aa.quantity) AS quantity,
+ sum(aa.stockNum) AS stockNum,
+ SUM(aa.stockArea) AS stockArea,
+ count(* ) AS 'total',
+ CEILING( count(* )/#{pageSize} ) AS 'pageTotal'
+ from
+ (
+ SELECT (od.quantity) AS quantity,
+ d.numCounts + d.patchNumSum - d.numCount -d.broken_num as stockNum,
+ ROUND(ogd.child_width * ogd.child_height *
+ (d.numCounts + d.patchNumSum - d.numCount -
+ d.broken_num) / 1000000, 2) as stockArea
+ FROM
+ sd.order_detail AS od
+ LEFT JOIN sd.order_glass_detail AS ogd
+ ON od.order_id = ogd.order_id
+ AND od.order_number = ogd.order_number
+ LEFT JOIN pp.flow_card AS fc
+ ON fc.order_id = ogd.order_id
+ and fc.production_id = ogd.production_id
+ AND fc.order_number = ogd.order_number
+ AND fc.technology_number = ogd.technology_number
+ left join (
+ SELECT
+ odpd.process,
+ odpd.process_id,
+ odpd.order_number,
+ odpd.technology_number,
+ odpds.reporting_work_num_count as numCounts,
+ ifnull( c.patchNumSum, 0 ) as patchNumSum,
+ odpd.reporting_work_num_count as numCount,
+ odpd.broken_num
+ FROM
+ sd.order_process_detail AS odpd
+ LEFT JOIN sd.order_process_detail AS odpds ON odpds.id = odpd.id - 1
+ LEFT JOIN (
+ SELECT
+ sum( rw.rework_num ) AS 'patchNumSum',
+ rw.process_id,
+ rw.order_sort,
+ rw.technology_number,
+ rwk.this_process
+ FROM
+ pp.rework AS rw
+ LEFT JOIN pp.reporting_work AS rwk ON rw.reporting_work_id = rwk.reporting_work_id
+ WHERE
+ position( #{selectProcesses} IN rwk.this_process )
+ AND rw.review_status >= 0
+ GROUP BY
+ rw.process_id,
+ rw.order_sort,
+ rw.technology_number
+ ) AS c ON c.process_id = odpd.process_id
+ AND c.order_sort = odpd.order_number
+ AND c.technology_number = odpd.technology_number
+ WHERE
+ position(#{selectProcesses} IN odpd.process ) and odpds.reporting_work_num_count is not null
+ GROUP BY
+ odpd.process_id,
+ odpd.order_number,
+ odpd.technology_number,
+ odpd.process
+
+ ) as d
+ on d.process_id=fc.process_id and d.order_number=fc.order_number and d.technology_number=fc.technology_number
+ and position(#{selectProcesses} in d.process)
+ left join sd.`order` as o on o.order_id=od.order_id
+ where o.create_order>0
+ and d.numCounts +d.patchNumSum - d.numCount - d.broken_num != 0
+ and d.process!=SUBSTRING_INDEX(ogd.process, '->', 1)
+ and position(#{selectProcesses} in d.process)
+ and position(#{orderId} in od.order_id)
+ and position(#{inputProject} in o.project)
+ <if test="workInProgressDTO.customerName != null and workInProgressDTO.customerName != ''">
+ and o.customer_name regexp #{workInProgressDTO.customerName}
+ </if>
+ <if test="workInProgressDTO.project != null and workInProgressDTO.project != ''">
+ and o.project regexp #{workInProgressDTO.project}
+ </if>
+ <if test="workInProgressDTO.orderId != null and workInProgressDTO.orderId != ''">
+ and o.order_id regexp #{workInProgressDTO.orderId}
+ </if>
+ <if test="workInProgressDTO.batch != null and workInProgressDTO.batch != ''">
+ and o.batch regexp #{workInProgressDTO.batch}
+ </if>
+ <if test="workInProgressDTO.processId != null and workInProgressDTO.processId != ''">
+ and fc.process_id regexp #{workInProgressDTO.processId}
+ </if>
+ <if test="workInProgressDTO.orderNumber != null and workInProgressDTO.orderNumber != ''">
+ and ogd.order_number regexp #{workInProgressDTO.orderNumber}
+ </if>
+ <if test="workInProgressDTO.technologyNumber != null and workInProgressDTO.technologyNumber != ''">
+ and ogd.technology_number regexp #{workInProgressDTO.technologyNumber}
+ </if>
+ <if test="workInProgressDTO.glassNumber != null and workInProgressDTO.glassNumber != ''">
+ and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{workInProgressDTO.glassNumber}
+ </if>
+
+ group by fc.process_id, fc.order_number, fc.technology_number,d.process
+ ) as aa
+
+ </select>
+
+ <select id="processToBeCompletedFootSum">
+ SELECT
+ SUM(fc.quantity) AS quantity,
+ ROUND(SUM(ogd.child_width * ogd.child_height) / 1000000, 2) AS childArea,
+ ROUND(SUM(ogd.child_width * ogd.child_height * fc.quantity) / 1000000, 2) AS actualArea,
+ SUM(odpd.reporting_work_num) AS completeNum,
+ ROUND(SUM(ogd.child_width * ogd.child_height * odpd.reporting_work_num) / 1000000, 2) AS completeArea,
+ SUM(fc.quantity - odpd.reporting_work_num) AS incompleteNum,
+ ROUND(SUM(ogd.child_width * ogd.child_height * (fc.quantity - odpd.reporting_work_num)) / 1000000, 2) AS incompleteArea
+ FROM sd.order_detail AS od
+ LEFT JOIN sd.order_glass_detail AS ogd
+ ON od.order_id = ogd.order_id
+ AND od.order_number = ogd.order_number
+ LEFT JOIN flow_card AS fc
+ ON fc.order_id = ogd.order_id
+ AND fc.production_id = ogd.production_id
+ AND fc.order_number = ogd.order_number
+ AND fc.technology_number = ogd.technology_number
+ LEFT JOIN sd.order_process_detail AS odpd
+ ON odpd.order_id = fc.order_id
+ AND odpd.order_number = fc.order_number
+ AND odpd.technology_number = fc.technology_number
+ AND odpd.process_id = fc.process_id
+ LEFT JOIN sd.`order` AS o
+ ON o.order_id = od.order_id
+ WHERE o.create_order > 0
+ and odpd.process = #{selectProcesses}
+ and o.create_time >= #{selectTime1}
+ AND o.create_time < #{selectTime2}
+ and position(#{orderId} in od.order_id)
+ and position(#{inputProject} in o.project)
+ AND fc.quantity - odpd.reporting_work_num > 0;
+
+ </select>
+
+ <select id="damageReportFootSum">
+ SELECT
+ SUM(dd.breakage_quantity) AS breakageQuantity,
+ ROUND(SUM(ogd.child_width * ogd.child_height * dd.breakage_quantity) / 1000000, 2) AS area
+ FROM
+ sd.ORDER AS o
+ LEFT JOIN sd.order_glass_detail AS ogd ON ogd.order_id = o.order_id
+ LEFT JOIN reporting_work AS rw ON rw.order_id = o.order_id
+ LEFT JOIN damage_details AS dd ON dd.reporting_work_id = rw.reporting_work_id
+ AND dd.order_number = ogd.order_number
+ AND dd.technology_number = ogd.technology_number
+ LEFT JOIN sd.order_detail AS od ON o.order_id = od.order_id
+ AND od.order_number = ogd.order_number
+ WHERE
+ rw.reporting_work_time >= #{selectTime1}
+ AND rw.reporting_work_time < #{selectTime2}
+ AND dd.available = 0
+ <if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''">
+ and o.order_id regexp #{damageReportDTO.orderId}
+ </if>
+ <if test="damageReportDTO.project != null and damageReportDTO.project != ''">
+ and o.project regexp #{damageReportDTO.project}
+ </if>
+ <if test="damageReportDTO.processId != null and damageReportDTO.processId != ''">
+ and rw.process_id regexp #{damageReportDTO.processId}
+ </if>
+ <if test="damageReportDTO.orderNumber != null and damageReportDTO.orderNumber != ''">
+ and dd.order_number regexp #{damageReportDTO.orderNumber}
+ </if>
+ <if test="damageReportDTO.technologyNumber != null and damageReportDTO.technologyNumber != ''">
+ and dd.technology_number regexp #{damageReportDTO.technologyNumber}
+ </if>
+ <if test="damageReportDTO.responsibleProcess != null and damageReportDTO.responsibleProcess != ''">
+ and dd.responsible_process regexp #{damageReportDTO.responsibleProcess}
+ </if>
+ <if test="damageReportDTO.responsibleTeam != null and damageReportDTO.responsibleTeam != ''">
+ and dd.responsible_team regexp #{damageReportDTO.responsibleTeam}
+ </if>
+ <if test="damageReportDTO.responsibleEquipment != null and damageReportDTO.responsibleEquipment != ''">
+ and dd.responsible_equipment regexp #{damageReportDTO.responsibleEquipment}
+ </if>
+ <if test="damageReportDTO.breakageType != null and damageReportDTO.breakageType != ''">
+ and dd.breakage_type regexp #{damageReportDTO.breakageType}
+ </if>
+ <if test="damageReportDTO.breakageReason != null and damageReportDTO.breakageReason != ''">
+ and dd.breakage_reason regexp #{damageReportDTO.breakageReason}
+ </if>
+ <if test="damageReportDTO.glassChild != null and damageReportDTO.glassChild != ''">
+ and ogd.glass_child regexp #{damageReportDTO.glassChild}
+ </if>
+ <if test="damageReportDTO.glassNumber != null and damageReportDTO.glassNumber != ''">
+ and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{damageReportDTO.glassNumber}
+ </if>
+ </select>
+
+ <select id="teamOutputFootSum">
+ select SUM(completed_quantity) as completedQuantity,
+ ifnull(SUM(ROUND(width * height * completed_quantity / 1000000, 2)),0) AS area
+ from (
+ SELECT
+ rw.this_process,
+ rw.teams_groups_name,
+ o.project,
+ rw.process_id,
+ fc.order_number,
+ MAX( ogd.child_width ) as width,
+ MAX( ogd.child_height ) as height,
+ rwd.completed_quantity as completed_quantity
+ FROM
+ reporting_work as rw left join reporting_work_detail as rwd on rwd.reporting_work_id=rw.reporting_work_id
+ left join flow_card as fc on fc.order_id=rw.order_id and fc.process_id=rw.process_id and fc.order_number=rwd.order_number and fc.technology_number=rwd.technology_number
+ left join sd.order_glass_detail as ogd on ogd.order_id=fc.order_id and ogd.order_number=fc.order_number and ogd.technology_number=fc.technology_number
+ left join sd.order_detail as od on od.order_id=ogd.order_id and od.order_number=ogd.order_number
+ left join sd.`order` as o on o.order_id=od.order_id
+ where o.create_order>0 and rw.reviewed_state>=0 and rwd.completed_quantity>0
+ AND rw.reporting_work_time >= #{selectTime1}
+ AND rw.reporting_work_time < #{selectTime2}
+ and position(#{selectProcesses} in rw.this_process)
+ <if test="teamOutputDTO.thisProcess != null and teamOutputDTO.thisProcess != ''">
+ and rw.this_process regexp #{teamOutputDTO.thisProcess}
+ </if>
+ <if test="teamOutputDTO.teamsGroupsName != null and teamOutputDTO.teamsGroupsName != ''">
+ and rw.teams_groups_name regexp #{teamOutputDTO.teamsGroupsName}
+ </if>
+ <if test="teamOutputDTO.project != null and teamOutputDTO.project != ''">
+ and o.project regexp #{teamOutputDTO.project}
+ </if>
+ <if test="teamOutputDTO.processId != null and teamOutputDTO.processId != ''">
+ and rw.process_id regexp #{teamOutputDTO.processId}
+ </if>
+ <if test="teamOutputDTO.edgingType != null and teamOutputDTO.edgingType != ''">
+ and od.edging_type regexp #{teamOutputDTO.edgingType}
+ </if>
+ <choose>
+ <when test="laminating == ''">
+ GROUP BY
+ rw.reporting_work_id,
+ rw.process_id,
+ rw.this_process,
+ rw.teams_groups_name,
+ rwd.order_number,
+ rwd.technology_number
+ </when>
+ <otherwise>
+ GROUP BY
+ rw.reporting_work_id,
+ rw.process_id,
+ rw.this_process,
+ rw.teams_groups_name,
+ rwd.order_number
+ </otherwise>
+ </choose>
+ ORDER BY
+ rw.this_process,
+ rw.process_id,
+ rwd.order_number,
+ rw.reporting_work_time,
+ rw.teams_groups_name
+ ) as subquery
+ </select>
+
+ <select id="getLaminating">
+ select IFNULL(nickname,'') from sd.basic_data where basic_category='process' and basic_name=#{selectProcesses}
+ </select>
+
+ <select id="workInProgressMpdataList1" resultMap="workInProgressMap">
+ select if(#{selectProcesses}='',d.process,#{selectProcesses}) as thisProcess,
+ fc.process_id,
+ o.customer_name,
+ o.project,
+ o.order_id,
+ o.batch,
+ od.shape,
+ if(od.shape=2,JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04')),od.bend_radius) as bend_radius,
+ ogd.order_number,
+ ogd.technology_number,
+ ogd.process,
+ od.quantity,
+ ogd.child_width,
+ ogd.child_height,
+ d.numCounts + d.patchNumSum - d.numCount -d.broken_num as stockNum,
+ ROUND(ogd.child_width * ogd.child_height *
+ (d.numCounts + d.patchNumSum - d.numCount -
+ d.broken_num) / 1000000, 2) as stockArea,
+ od.product_name,
+ od.bend_radius,
+ ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') AS glassNumber
+ from sd.order_detail AS od
+ LEFT JOIN sd.order_glass_detail AS ogd
+ ON od.order_id = ogd.order_id
+ AND od.order_number = ogd.order_number
+ LEFT JOIN pp.flow_card AS fc
+ ON fc.order_id = ogd.order_id
+ and fc.production_id = ogd.production_id
+ AND fc.order_number = ogd.order_number
+ AND fc.technology_number = ogd.technology_number
+ left join (
+ SELECT
+ odpd.process,
+ odpd.process_id,
+ odpd.order_number,
+ odpd.technology_number,
+ odpds.reporting_work_num_count as numCounts,
+ ifnull( c.patchNumSum, 0 ) as patchNumSum,
+ odpd.reporting_work_num_count as numCount,
+ odpd.broken_num
+ FROM
+ sd.order_process_detail AS odpd
+ LEFT JOIN sd.order_process_detail AS odpds ON odpds.id = odpd.id - 1
+ LEFT JOIN (
+ SELECT
+ sum( rw.rework_num ) AS 'patchNumSum',
+ rw.process_id,
+ rw.order_sort,
+ rw.technology_number,
+ rwk.this_process
+ FROM
+ pp.rework AS rw
+ LEFT JOIN pp.reporting_work AS rwk ON rw.reporting_work_id = rwk.reporting_work_id
+ WHERE
+ position( #{selectProcesses} IN rwk.this_process )
+ AND rw.review_status >= 0
+ GROUP BY
+ rw.process_id,
+ rw.order_sort,
+ rw.technology_number
+ ) AS c ON c.process_id = odpd.process_id
+ AND c.order_sort = odpd.order_number
+ AND c.technology_number = odpd.technology_number
+ WHERE
+ position(#{selectProcesses} IN odpd.process ) and odpds.reporting_work_num_count is not null
+ GROUP BY
+ odpd.process_id,
+ odpd.order_number,
+ odpd.technology_number,
+ odpd.process
+
+ ) as d
+ on d.process_id=fc.process_id and d.order_number=fc.order_number and d.technology_number=fc.technology_number
+ and position(#{selectProcesses} in d.process)
+ left join sd.`order` as o on o.order_id=od.order_id
+ where o.create_order>0
+ and d.numCounts +d.patchNumSum - d.numCount - d.broken_num != 0
+ and d.process!=SUBSTRING_INDEX(ogd.process, '->', 1)
+ and position(#{selectProcesses} in d.process)
+ and position(#{orderId} in od.order_id)
+ and position(#{inputProject} in o.project)
+ <if test="workInProgressDTO.customerName != null and workInProgressDTO.customerName != ''">
+ and o.customer_name regexp #{workInProgressDTO.customerName}
+ </if>
+ <if test="workInProgressDTO.project != null and workInProgressDTO.project != ''">
+ and o.project regexp #{workInProgressDTO.project}
+ </if>
+ <if test="workInProgressDTO.orderId != null and workInProgressDTO.orderId != ''">
+ and o.order_id regexp #{workInProgressDTO.orderId}
+ </if>
+ <if test="workInProgressDTO.batch != null and workInProgressDTO.batch != ''">
+ and o.batch regexp #{workInProgressDTO.batch}
+ </if>
+ <if test="workInProgressDTO.processId != null and workInProgressDTO.processId != ''">
+ and fc.process_id regexp #{workInProgressDTO.processId}
+ </if>
+ <if test="workInProgressDTO.orderNumber != null and workInProgressDTO.orderNumber != ''">
+ and ogd.order_number regexp #{workInProgressDTO.orderNumber}
+ </if>
+ <if test="workInProgressDTO.technologyNumber != null and workInProgressDTO.technologyNumber != ''">
+ and ogd.technology_number regexp #{workInProgressDTO.technologyNumber}
+ </if>
+ <if test="workInProgressDTO.glassNumber != null and workInProgressDTO.glassNumber != ''">
+ and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{workInProgressDTO.glassNumber}
+ </if>
+ group by fc.process_id, fc.order_number, fc.technology_number,d.process
+ order by fc.process_id, fc.order_number, fc.technology_number
+ limit #{offset},#{pageSize};
+ </select>
+
+ <select id="workInProgressMpdataList2" resultMap="workInProgressMap">
+ select
+ a.process_id,a.teams_groups_name,a.next_process,b.technology_number,b.order_number
+ from pp.reporting_work as a
+ left join pp.reporting_work_detail as b on a.reporting_work_id=b.reporting_work_id
+ where position(#{selectProcesses} in a.next_process) and a.next_process!='鍒囧壊'
+ GROUP BY a.reporting_work_id
+ </select>
+
+ <select id="workInProgressOrderMpList1" resultMap="workInProgressMap">
+ select if(#{selectProcesses}='',odpd.process,#{selectProcesses}) as thisProcess,
+ o.customer_name,
+ o.project,
+ o.order_id,
+ o.batch,
+ od.shape,
+ sum(od.quantity) as quantity,
+ sum(odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
+ odpd.broken_num) as stockNum,
+ sum(ROUND(ogd.child_width * ogd.child_height *
+ (odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
+ odpd.broken_num) / 1000000, 2)) as stockArea,
+ od.product_name
+
+ from sd.order_detail AS od
+ LEFT JOIN sd.order_glass_detail AS ogd
+ ON od.order_id = ogd.order_id
+ AND od.order_number = ogd.order_number
+ LEFT JOIN flow_card AS fc
+ ON fc.order_id = ogd.order_id
+ and fc.production_id = ogd.production_id
+ AND fc.order_number = ogd.order_number
+ AND fc.technology_number = ogd.technology_number
+ left join sd.order_process_detail as odpd
+ ON odpd.order_id = fc.order_id
+ AND odpd.order_number = fc.order_number
+ AND odpd.technology_number = fc.technology_number
+ and odpd.process_id = fc.process_id
+ left join sd.order_process_detail as odpds
+ ON odpds.id = odpd.id - 1
+ left join
+ (SELECT sum(rw.rework_num) as 'patchNumSum',
+ rw.process_id,
+ rw.order_sort,
+ rw.technology_number,
+ rwk.this_process
+ from rework as rw
+ LEFT JOIN
+ reporting_work as rwk
+ on rw.reporting_work_id = rwk.reporting_work_id
+ where position(#{selectProcesses} in rwk.this_process)
+ and rw.review_status >= 0
+ GROUP BY rw.process_id, rw.order_sort, rw.technology_number) as c
+ on c.process_id = fc.process_id
+ and c.order_sort = fc.order_number
+ and c.technology_number = fc.technology_number
+ left join sd.`order` as o
+ on o.order_id = od.order_id
+ where o.create_order>0
+ and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
+ odpd.broken_num != 0 and odpd.process!=SUBSTRING_INDEX(ogd.process, '->', 1)
+ and position(#{selectProcesses} in odpd.process)
+ and position(#{orderId} in od.order_id)
+ and position(#{inputProject} in o.project)
+ <if test="workInProgressDTO.customerName != null and workInProgressDTO.customerName != ''">
+ and o.customer_name regexp #{workInProgressDTO.customerName}
+ </if>
+ <if test="workInProgressDTO.project != null and workInProgressDTO.project != ''">
+ and o.project regexp #{workInProgressDTO.project}
+ </if>
+ <if test="workInProgressDTO.orderId != null and workInProgressDTO.orderId != ''">
+ and o.order_id regexp #{workInProgressDTO.orderId}
+ </if>
+ <if test="workInProgressDTO.batch != null and workInProgressDTO.batch != ''">
+ and o.batch regexp #{workInProgressDTO.batch}
+ </if>
+ group by o.order_id
+ order by o.order_id
+ limit #{offset},#{pageSize};
+ </select>
+
+ <select id="workInProgressProcessMpList1" resultMap="workInProgressMap">
+ select if(#{selectProcesses}='',odpd.process,#{selectProcesses}) as thisProcess,
+ o.customer_name,
+ o.project,
+ o.order_id,
+ fc.process_id,
+ o.batch,
+ od.shape,
+ sum(od.quantity) as quantity,
+ sum(odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
+ odpd.broken_num) as stockNum,
+ sum(ROUND(ogd.child_width * ogd.child_height *
+ (odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
+ odpd.broken_num) / 1000000, 2)) as stockArea,
+ od.product_name
+
+ from sd.order_detail AS od
+ LEFT JOIN sd.order_glass_detail AS ogd
+ ON od.order_id = ogd.order_id
+ AND od.order_number = ogd.order_number
+ LEFT JOIN flow_card AS fc
+ ON fc.order_id = ogd.order_id
+ and fc.production_id = ogd.production_id
+ AND fc.order_number = ogd.order_number
+ AND fc.technology_number = ogd.technology_number
+ left join sd.order_process_detail as odpd
+ ON odpd.order_id = fc.order_id
+ AND odpd.order_number = fc.order_number
+ AND odpd.technology_number = fc.technology_number
+ and odpd.process_id = fc.process_id
+ left join sd.order_process_detail as odpds
+ ON odpds.id = odpd.id - 1
+ left join
+ (SELECT sum(rw.rework_num) as 'patchNumSum',
+ rw.process_id,
+ rw.order_sort,
+ rw.technology_number,
+ rwk.this_process
+ from rework as rw
+ LEFT JOIN
+ reporting_work as rwk
+ on rw.reporting_work_id = rwk.reporting_work_id
+ where position(#{selectProcesses} in rwk.this_process)
+ and rw.review_status >= 0
+ GROUP BY rw.process_id, rw.order_sort, rw.technology_number) as c
+ on c.process_id = fc.process_id
+ and c.order_sort = fc.order_number
+ and c.technology_number = fc.technology_number
+ left join sd.`order` as o
+ on o.order_id = od.order_id
+ where o.create_order>0
+ and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -
+ odpd.broken_num != 0 and odpd.process!=SUBSTRING_INDEX(ogd.process, '->', 1)
+ and position(#{selectProcesses} in odpd.process)
+ and position(#{orderId} in od.order_id)
+ and position(#{inputProject} in o.project)
+ <if test="workInProgressDTO.customerName != null and workInProgressDTO.customerName != ''">
+ and o.customer_name regexp #{workInProgressDTO.customerName}
+ </if>
+ <if test="workInProgressDTO.project != null and workInProgressDTO.project != ''">
+ and o.project regexp #{workInProgressDTO.project}
+ </if>
+ <if test="workInProgressDTO.orderId != null and workInProgressDTO.orderId != ''">
+ and o.order_id regexp #{workInProgressDTO.orderId}
+ </if>
+ <if test="workInProgressDTO.batch != null and workInProgressDTO.batch != ''">
+ and o.batch regexp #{workInProgressDTO.batch}
+ </if>
+ <if test="workInProgressDTO.processId != null and workInProgressDTO.processId != ''">
+ and fc.process_id regexp #{workInProgressDTO.processId}
+ </if>
+ group by o.order_id, fc.process_id
+ order by o.order_id, fc.process_id
+ limit #{offset},#{pageSize};
+ </select>
+
+ <select id="exportWorkInProgressMpdataList2">
+ select
+ a.process_id,a.teams_groups_name,a.next_process,b.technology_number,b.order_number
+ from pp.reporting_work as a
+ left join pp.reporting_work_detail as b on a.reporting_work_id=b.reporting_work_id
+ where position(#{process} in a.next_process) and a.next_process!='鍒囧壊'
+ GROUP BY a.reporting_work_id
+ </select>
+
+ <select id="workInProgressCombinationMpdataList2">
+ select
+ a.process_id,a.teams_groups_name,a.next_process,b.technology_number,b.order_number
+ from pp.reporting_work as a
+ left join pp.reporting_work_detail as b on a.reporting_work_id=b.reporting_work_id
+ where position(#{selectProcesses} in a.next_process) and a.next_process!='鍒囧壊'
+ GROUP BY a.reporting_work_id
+ </select>
+
+ <select id="workInProgressCombinationMpdataList1">
+ select if(#{selectProcesses}='',d.process,#{selectProcesses}) as thisProcess,
+ o.project,
+ SUM(d.numCounts + d.patchNumSum - d.numCount -d.broken_num) as stockNum,
+ SUM(ROUND(ogd.child_width * ogd.child_height *
+ (d.numCounts + d.patchNumSum - d.numCount -
+ d.broken_num) / 1000000, 2)) as stockArea
+ from sd.order_detail AS od
+ LEFT JOIN sd.order_glass_detail AS ogd
+ ON od.order_id = ogd.order_id
+ AND od.order_number = ogd.order_number
+ LEFT JOIN pp.flow_card AS fc
+ ON fc.order_id = ogd.order_id
+ and fc.production_id = ogd.production_id
+ AND fc.order_number = ogd.order_number
+ AND fc.technology_number = ogd.technology_number
+ left join (
+ SELECT
+ odpd.process,
+ odpd.process_id,
+ odpd.order_number,
+ odpd.technology_number,
+ odpds.reporting_work_num_count as numCounts,
+ ifnull( c.patchNumSum, 0 ) as patchNumSum,
+ odpd.reporting_work_num_count as numCount,
+ odpd.broken_num
+ FROM
+ sd.order_process_detail AS odpd
+ LEFT JOIN sd.order_process_detail AS odpds ON odpds.id = odpd.id - 1
+ LEFT JOIN (
+ SELECT
+ sum( rw.rework_num ) AS 'patchNumSum',
+ rw.process_id,
+ rw.order_sort,
+ rw.technology_number,
+ rwk.this_process
+ FROM
+ pp.rework AS rw
+ LEFT JOIN pp.reporting_work AS rwk ON rw.reporting_work_id = rwk.reporting_work_id
+ WHERE
+ position( #{selectProcesses} IN rwk.this_process )
+ AND rw.review_status >= 0
+ GROUP BY
+ rw.process_id,
+ rw.order_sort,
+ rw.technology_number
+ ) AS c ON c.process_id = odpd.process_id
+ AND c.order_sort = odpd.order_number
+ AND c.technology_number = odpd.technology_number
+ WHERE
+ position(#{selectProcesses} IN odpd.process ) and odpds.reporting_work_num_count is not null
+ GROUP BY
+ odpd.process_id,
+ odpd.order_number,
+ odpd.technology_number,
+ odpd.process
+
+ ) as d
+ on d.process_id=fc.process_id and d.order_number=fc.order_number and d.technology_number=fc.technology_number
+ and position(#{selectProcesses} in d.process)
+ left join sd.`order` as o on o.order_id=od.order_id
+ where o.create_order>0
+ and d.numCounts +d.patchNumSum - d.numCount - d.broken_num != 0
+ and d.process!=SUBSTRING_INDEX(ogd.process, '->', 1)
+ and position(#{selectProcesses} in d.process)
+
+ <if test="workInProgressDTO.project != null and workInProgressDTO.project != ''">
+ and o.project regexp #{workInProgressDTO.project}
+ </if>
+
+ group by d.process
+ order by d.process
+ limit #{offset},#{pageSize};
+ </select>
+
+ <select id="workInProgressCombinationOrderFootSum">
+ SELECT SUM(aa.quantity) AS quantity,
+ sum(aa.stockNum) AS stockNum,
+ SUM(aa.stockArea) AS stockArea,
+ count(* ) AS 'total',
+ CEILING( count(* )/#{pageSize} ) AS 'pageTotal'
+ from
+ (
+ SELECT (od.quantity) AS quantity,
+ d.numCounts + d.patchNumSum - d.numCount -d.broken_num as stockNum,
+ ROUND(ogd.child_width * ogd.child_height *
+ (d.numCounts + d.patchNumSum - d.numCount -
+ d.broken_num) / 1000000, 2) as stockArea
+ FROM
+ sd.order_detail AS od
+ LEFT JOIN sd.order_glass_detail AS ogd
+ ON od.order_id = ogd.order_id
+ AND od.order_number = ogd.order_number
+ LEFT JOIN pp.flow_card AS fc
+ ON fc.order_id = ogd.order_id
+ and fc.production_id = ogd.production_id
+ AND fc.order_number = ogd.order_number
+ AND fc.technology_number = ogd.technology_number
+ left join (
+ SELECT
+ odpd.process,
+ odpd.process_id,
+ odpd.order_number,
+ odpd.technology_number,
+ odpds.reporting_work_num_count as numCounts,
+ ifnull( c.patchNumSum, 0 ) as patchNumSum,
+ odpd.reporting_work_num_count as numCount,
+ odpd.broken_num
+ FROM
+ sd.order_process_detail AS odpd
+ LEFT JOIN sd.order_process_detail AS odpds ON odpds.id = odpd.id - 1
+ LEFT JOIN (
+ SELECT
+ sum( rw.rework_num ) AS 'patchNumSum',
+ rw.process_id,
+ rw.order_sort,
+ rw.technology_number,
+ rwk.this_process
+ FROM
+ pp.rework AS rw
+ LEFT JOIN pp.reporting_work AS rwk ON rw.reporting_work_id = rwk.reporting_work_id
+ WHERE
+ position( #{selectProcesses} IN rwk.this_process )
+ AND rw.review_status >= 0
+ GROUP BY
+ rw.process_id,
+ rw.order_sort,
+ rw.technology_number
+ ) AS c ON c.process_id = odpd.process_id
+ AND c.order_sort = odpd.order_number
+ AND c.technology_number = odpd.technology_number
+ WHERE
+ position(#{selectProcesses} IN odpd.process ) and odpds.reporting_work_num_count is not null
+ GROUP BY
+ odpd.process_id,
+ odpd.order_number,
+ odpd.technology_number,
+ odpd.process
+
+ ) as d
+ on d.process_id=fc.process_id and d.order_number=fc.order_number and d.technology_number=fc.technology_number
+ and position(#{selectProcesses} in d.process)
+ left join sd.`order` as o on o.order_id=od.order_id
+ where o.create_order>0
+ and d.numCounts +d.patchNumSum - d.numCount - d.broken_num != 0
+ and d.process!=SUBSTRING_INDEX(ogd.process, '->', 1)
+ and position(#{selectProcesses} in d.process)
+
+ <if test="workInProgressDTO.project != null and workInProgressDTO.project != ''">
+ and o.project regexp #{workInProgressDTO.project}
+ </if>
+ group by d.process
+ ) as aa
+ </select>
+
+ <select id="selectProcess">
+ SELECT basic_name
+ FROM sd.basic_data as bd
+ where bd.basic_category = 'process'
+ and bd.basic_type = 'product'
+ and basic_name!='鍒囧壊'
+ </select>
+
+ <select id="getWorkInProgressCombination">
+ select
+ #{process} as thisProcess,
+ if(#{optionVal} = 1,'',h.project) as project,
+ SUM(h.quantity) as stockNum,
+ SUM(h.glassArea) as stockArea,
+ if(#{optionVal} = 1,'',h.childName) as glassName
+
+ from (
+
+ SELECT g.*
+ ,GROUP_CONCAT(g.glass_child SEPARATOR '+') as childName
+ from( SELECT f.*,
+ e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num as quantity,
+ (e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num)*f.area as glassArea
+ from (SELECT a.order_id,
+ if(a.batch!="",CONCAT(a.project,'(',a.batch,')'),a.project) as project,
+ C.product_id,
+ b.order_number,
+ b.process_id,
+ b.technology_number,
+ b.reporting_work_num_count,
+ d.`group` ,
+ b.broken_num,
+ b.id,
+ c.area,
+ d.glass_child,
+ ifnull(cb.patchNumSum,0) as patchNumSum
+
+ FROM sd.`order` as a
+ LEFT JOIN sd.order_process_detail as b
+ on b.process = #{process} and a.order_id =b.order_id
+ LEFT JOIN sd.order_detail as c
+ on a.order_id = c.order_id and b.order_number =c.order_number
+ left join sd.order_glass_detail as d
+ on d.order_id =a.order_id and d.order_number = b.order_number and d.technology_number = b.technology_number
+ LEFT JOIN (
+ SELECT
+ IFNULL(sum( rw.rework_num ),0) AS 'patchNumSum',
+ rw.process_id,
+ rw.order_sort,
+ rw.technology_number,
+ rwk.this_process
+ FROM
+ pp.rework AS rw
+ LEFT JOIN pp.reporting_work AS rwk ON rw.reporting_work_id = rwk.reporting_work_id
+ WHERE
+ position( #{process} IN rwk.this_process )
+ AND rw.review_status >= 0
+ GROUP BY
+ rw.process_id,
+ rw.order_sort,
+ rw.technology_number
+ ) AS cb ON cb.process_id = b.process_id
+ AND cb.order_sort = b.order_number
+ AND cb.technology_number = b.technology_number
+ where a.processing_card>0
+ and a.warehousing!=2
+ and (c.quantity-b.reporting_work_num_count)>0
+ GROUP BY b.process_id, b.order_number,
+ b.technology_number) as f
+ LEFT JOIN sd.order_process_detail as e
+ on e.id=(f.id-1) and e.process_id = f.process_id and e.order_number = f.order_number and e.technology_number =f.technology_number
+ where
+ e.id is not null
+ and (e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num)>0 ) as g
+ <choose>
+ <when test="laminating == 'stepC' and process == '棰勫帇'">
+ GROUP BY g.process_id, g.order_number, g.technology_number
+ </when>
+ <when test="laminating == 'stepC'">
+ GROUP BY g.process_id, g.order_number, g.`group`
+ </when>
+ <when test="laminating == 'stepD'">
+ GROUP BY g.process_id, g.order_number
+ </when>
+ <otherwise>
+ GROUP BY g.process_id, g.order_number, g.technology_number
+ </otherwise>
+ </choose>
+
+
+ ) as h
+ <choose>
+ <when test="optionVal == 1">
+ GROUP BY thisProcess
+ </when>
+ <otherwise>
+ GROUP BY h.project,h.childName
+ </otherwise>
+ </choose>
+
+ </select>
+
+ <select id="getWorkInProgressCombinationFootSum">
+ select
+ SUM(h.quantity) as stockNum,
+ SUM(h.glassArea) as stockArea
+ from (
+ SELECT g.*
+ ,GROUP_CONCAT(g.glass_child SEPARATOR '+') as childName
+ from( SELECT f.*,
+ e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num as quantity,
+ (e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num)*f.area as glassArea
+ from (SELECT a.order_id,
+ a.project,
+ C.product_id,
+ b.order_number,
+ b.process_id,
+ b.technology_number,
+ b.reporting_work_num_count,
+ d.`group` ,
+ b.broken_num,
+ b.id,
+ c.area,
+ d.glass_child,
+ ifnull(cb.patchNumSum,0) as patchNumSum
+
+ FROM sd.`order` as a
+ LEFT JOIN sd.order_process_detail as b
+ on b.process = #{process} and a.order_id =b.order_id
+ LEFT JOIN sd.order_detail as c
+ on a.order_id = c.order_id and b.order_number =c.order_number
+ left join sd.order_glass_detail as d
+ on d.order_id =a.order_id and d.order_number = b.order_number and d.technology_number = b.technology_number
+ LEFT JOIN (
+ SELECT
+ IFNULL(sum( rw.rework_num ),0) AS 'patchNumSum',
+ rw.process_id,
+ rw.order_sort,
+ rw.technology_number,
+ rwk.this_process
+ FROM
+ pp.rework AS rw
+ LEFT JOIN pp.reporting_work AS rwk ON rw.reporting_work_id = rwk.reporting_work_id
+ WHERE
+ position( #{process} IN rwk.this_process )
+ AND rw.review_status >= 0
+ GROUP BY
+ rw.process_id,
+ rw.order_sort,
+ rw.technology_number
+ ) AS cb ON cb.process_id = b.process_id
+ AND cb.order_sort = b.order_number
+ AND cb.technology_number = b.technology_number
+ where a.processing_card>0
+ and a.warehousing!=2
+ and (c.quantity-b.reporting_work_num_count)>0
+ GROUP BY b.process_id, b.order_number,
+ b.technology_number) as f
+ LEFT JOIN sd.order_process_detail as e
+ on e.id=(f.id-1) and e.process_id = f.process_id and e.order_number = f.order_number and e.technology_number =f.technology_number
+ where
+ e.id is not null
+ and e.reporting_work_num_count-f.reporting_work_num_count>0 ) as g
+ <choose>
+ <when test="laminating == 'stepC' and process == '棰勫帇'">
+ GROUP BY g.process_id, g.order_number, g.technology_number
+ </when>
+ <when test="laminating == 'stepC'">
+ GROUP BY g.process_id, g.order_number, g.`group`
+ </when>
+ <when test="laminating == 'stepD'">
+ GROUP BY g.process_id, g.order_number
+ </when>
+ <otherwise>
+ GROUP BY g.process_id, g.order_number, g.technology_number
+ </otherwise>
+ </choose>
+
+
+ ) as h
+
+ </select>
+
+ <select id="exportWorkInProgressCombination">
+ select
+ #{process} as thisProcess,
+ if(#{inputVal} = 1,'',h.project) as project,
+ SUM(h.quantity) as stockNum,
+ SUM(h.glassArea) as stockArea,
+ if(#{inputVal} = 1,'',h.childName) as glassName
+
+ from (
+
+ SELECT g.*
+ ,GROUP_CONCAT(g.glass_child SEPARATOR '+') as childName
+ from( SELECT f.*,
+ e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num as quantity,
+ (e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num)*f.area as glassArea
+ from (SELECT a.order_id,
+ a.project,
+ C.product_id,
+ b.order_number,
+ b.process_id,
+ b.technology_number,
+ b.reporting_work_num_count,
+ d.`group` ,
+ b.broken_num,
+ b.id,
+ c.area,
+ d.glass_child,
+ ifnull(cb.patchNumSum,0) as patchNumSum
+
+ FROM sd.`order` as a
+ LEFT JOIN sd.order_process_detail as b
+ on b.process = #{process} and a.order_id =b.order_id
+ LEFT JOIN sd.order_detail as c
+ on a.order_id = c.order_id and b.order_number =c.order_number
+ left join sd.order_glass_detail as d
+ on d.order_id =a.order_id and d.order_number = b.order_number and d.technology_number = b.technology_number
+ LEFT JOIN (
+ SELECT
+ IFNULL(sum( rw.rework_num ),0) AS 'patchNumSum',
+ rw.process_id,
+ rw.order_sort,
+ rw.technology_number,
+ rwk.this_process
+ FROM
+ pp.rework AS rw
+ LEFT JOIN pp.reporting_work AS rwk ON rw.reporting_work_id = rwk.reporting_work_id
+ WHERE
+ position( #{process} IN rwk.this_process )
+ AND rw.review_status >= 0
+ GROUP BY
+ rw.process_id,
+ rw.order_sort,
+ rw.technology_number
+ ) AS cb ON cb.process_id = b.process_id
+ AND cb.order_sort = b.order_number
+ AND cb.technology_number = b.technology_number
+ where a.processing_card>0
+ and a.warehousing!=2
+ and (c.quantity-b.reporting_work_num_count)>0
+ GROUP BY b.process_id, b.order_number,
+ b.technology_number) as f
+ LEFT JOIN sd.order_process_detail as e
+ on e.id=(f.id-1) and e.process_id = f.process_id and e.order_number = f.order_number and e.technology_number =f.technology_number
+ where
+ e.id is not null
+ and (e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num)>0 ) as g
+ <choose>
+ <when test="laminating == 'stepC' and process == '棰勫帇'">
+ GROUP BY g.process_id, g.order_number, g.technology_number
+ </when>
+ <when test="laminating == 'stepC'">
+ GROUP BY g.process_id, g.order_number, g.`group`
+ </when>
+ <when test="laminating == 'stepD'">
+ GROUP BY g.process_id, g.order_number
+ </when>
+ <otherwise>
+ GROUP BY g.process_id, g.order_number, g.technology_number
+ </otherwise>
+ </choose>
+
+
+ ) as h
+ <choose>
+ <when test="inputVal == 1">
+ GROUP BY thisProcess
+ </when>
+ <otherwise>
+ GROUP BY h.project,h.childName
+ </otherwise>
+ </choose>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0