From a660db06773007b1be690e0674829c00a57aeb7b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 十二月 2025 16:21:23 +0800
Subject: [PATCH] 订单首页流程卡新增楼层编号显示
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 541 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 376 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 acd6a17..3fac30d 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -171,6 +171,7 @@
<!-- 娴佺▼鍗¤繘搴�-->
<select id="processCardProgressMp">
select a.product_name,
+ a.building_number,
b.glass_child,
d.order_type,
concat(c.process_id, '/', c.technology_number) as process_id,
@@ -278,13 +279,17 @@
JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code,
CONCAT(rw.process_id,'/',GROUP_CONCAT(distinct dd.technology_number SEPARATOR '')) as process_id,
rw.creator,
- rw.reporting_work_id
+ rw.reporting_work_id,
+ ogd.child_width,
+ ogd.child_height,
+ JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) as thickness
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 pp.reporting_work as rw on rw.order_id=o.order_id
left join pp.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.product_detail as pd on pd.prod_id=od.product_id
where (rw.reporting_work_time) >= #{startDate}
and (rw.reporting_work_time) <= #{endDate}
and rw.this_worn_quantity > 0
@@ -293,43 +298,52 @@
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}
+ and JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) like concat('%', #{crossProcessBreakingDTO.code}, '%')
</if>
<if test="crossProcessBreakingDTO.processId != null and crossProcessBreakingDTO.processId != ''">
- and rw.process_id regexp #{crossProcessBreakingDTO.processId}
+ and rw.process_id like concat('%', #{crossProcessBreakingDTO.processId}, '%')
</if>
<if test="crossProcessBreakingDTO.thisProcess != null and crossProcessBreakingDTO.thisProcess != ''">
- and rw.this_process regexp #{crossProcessBreakingDTO.thisProcess}
+ and rw.this_process like concat('%', #{crossProcessBreakingDTO.thisProcess}, '%')
</if>
<if test="crossProcessBreakingDTO.responsibleProcess != null and crossProcessBreakingDTO.responsibleProcess != ''">
- and dd.responsible_process regexp #{crossProcessBreakingDTO.responsibleProcess}
+ and dd.responsible_process like concat('%', #{crossProcessBreakingDTO.responsibleProcess}, '%')
</if>
<if test="crossProcessBreakingDTO.responsibleTeam != null and crossProcessBreakingDTO.responsibleTeam != ''">
- and dd.responsible_team regexp #{crossProcessBreakingDTO.responsibleTeam}
+ and dd.responsible_team like concat('%', #{crossProcessBreakingDTO.responsibleTeam}, '%')
</if>
<if test="crossProcessBreakingDTO.glassChild != null and crossProcessBreakingDTO.glassChild != ''">
- and ogd.glass_child regexp #{crossProcessBreakingDTO.glassChild}
+ and ogd.glass_child like concat('%', #{crossProcessBreakingDTO.glassChild}, '%')
</if>
<if test="crossProcessBreakingDTO.breakageType != null and crossProcessBreakingDTO.breakageType != ''">
- and dd.breakage_type regexp #{crossProcessBreakingDTO.breakageType}
+ and dd.breakage_type like concat('%', #{crossProcessBreakingDTO.breakageType}, '%')
</if>
<if test="crossProcessBreakingDTO.project != null and crossProcessBreakingDTO.project != ''">
- and o.project regexp #{crossProcessBreakingDTO.project}
+ and o.project like concat('%', #{crossProcessBreakingDTO.project}, '%')
</if>
<if test="crossProcessBreakingDTO.orderId != null and crossProcessBreakingDTO.orderId != ''">
- and o.order_id regexp #{crossProcessBreakingDTO.orderId}
+ and o.order_id like concat('%', #{crossProcessBreakingDTO.orderId}, '%')
</if>
<if test="crossProcessBreakingDTO.responsiblePersonnel != null and crossProcessBreakingDTO.responsiblePersonnel != ''">
- and dd.responsible_personnel regexp #{crossProcessBreakingDTO.responsiblePersonnel}
+ and dd.responsible_personnel like concat('%', #{crossProcessBreakingDTO.responsiblePersonnel}, '%')
</if>
<if test="crossProcessBreakingDTO.creator != null and crossProcessBreakingDTO.creator != ''">
- and rw.creator regexp #{crossProcessBreakingDTO.creator}
+ and rw.creator like concat('%', #{crossProcessBreakingDTO.creator}, '%')
</if>
<if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
- and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{crossProcessBreakingDTO.code}
+ and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') like concat('%', #{crossProcessBreakingDTO.code}, '%')
</if>
<if test="crossProcessBreakingDTO.reportingWorkId != null and crossProcessBreakingDTO.reportingWorkId != ''">
- and rw.reporting_work_id regexp #{crossProcessBreakingDTO.reportingWorkId}
+ and rw.reporting_work_id like concat('%', #{crossProcessBreakingDTO.reportingWorkId}, '%')
+ </if>
+ <if test="crossProcessBreakingDTO.childWidth != null and crossProcessBreakingDTO.childWidth != ''">
+ and ogd.child_width regexp REGEXP_REPLACE(#{crossProcessBreakingDTO.childWidth},'\\.0+$','')
+ </if>
+ <if test="crossProcessBreakingDTO.childHeight != null and crossProcessBreakingDTO.childHeight != ''">
+ and ogd.child_height regexp REGEXP_REPLACE(#{crossProcessBreakingDTO.childHeight},'\\.0+$','')
+ </if>
+ <if test="crossProcessBreakingDTO.thickness != null and crossProcessBreakingDTO.thickness != ''">
+ and JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) like concat('%', #{crossProcessBreakingDTO.thickness}, '%')
</if>
GROUP BY dd.id
order by dd.id desc
@@ -354,13 +368,17 @@
JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code,
CONCAT(rw.process_id,'/',GROUP_CONCAT(distinct dd.technology_number SEPARATOR '')) as process_id,
rw.creator,
- rw.reporting_work_id
+ rw.reporting_work_id,
+ ogd.child_width,
+ ogd.child_height,
+ JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) as thickness
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 pp.reporting_work as rw on rw.order_id=o.order_id
left join pp.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.product_detail as pd on pd.prod_id=od.product_id
where (rw.reporting_work_time) >= #{startDate}
and (rw.reporting_work_time) <= #{endDate}
and rw.this_worn_quantity > 0
@@ -369,43 +387,52 @@
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}
+ and JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) like concat('%', #{crossProcessBreakingDTO.code}, '%')
</if>
<if test="crossProcessBreakingDTO.processId != null and crossProcessBreakingDTO.processId != ''">
- and rw.process_id regexp #{crossProcessBreakingDTO.processId}
+ and rw.process_id like concat('%', #{crossProcessBreakingDTO.processId}, '%')
</if>
<if test="crossProcessBreakingDTO.thisProcess != null and crossProcessBreakingDTO.thisProcess != ''">
- and rw.this_process regexp #{crossProcessBreakingDTO.thisProcess}
+ and rw.this_process like concat('%', #{crossProcessBreakingDTO.thisProcess}, '%')
</if>
<if test="crossProcessBreakingDTO.responsibleProcess != null and crossProcessBreakingDTO.responsibleProcess != ''">
- and dd.responsible_process regexp #{crossProcessBreakingDTO.responsibleProcess}
+ and dd.responsible_process like concat('%', #{crossProcessBreakingDTO.responsibleProcess}, '%')
</if>
<if test="crossProcessBreakingDTO.responsibleTeam != null and crossProcessBreakingDTO.responsibleTeam != ''">
- and dd.responsible_team regexp #{crossProcessBreakingDTO.responsibleTeam}
+ and dd.responsible_team like concat('%', #{crossProcessBreakingDTO.responsibleTeam}, '%')
</if>
<if test="crossProcessBreakingDTO.glassChild != null and crossProcessBreakingDTO.glassChild != ''">
- and ogd.glass_child regexp #{crossProcessBreakingDTO.glassChild}
+ and ogd.glass_child like concat('%', #{crossProcessBreakingDTO.glassChild}, '%')
</if>
<if test="crossProcessBreakingDTO.breakageType != null and crossProcessBreakingDTO.breakageType != ''">
- and dd.breakage_type regexp #{crossProcessBreakingDTO.breakageType}
+ and dd.breakage_type like concat('%', #{crossProcessBreakingDTO.breakageType}, '%')
</if>
<if test="crossProcessBreakingDTO.project != null and crossProcessBreakingDTO.project != ''">
- and o.project regexp #{crossProcessBreakingDTO.project}
+ and o.project like concat('%', #{crossProcessBreakingDTO.project}, '%')
</if>
<if test="crossProcessBreakingDTO.orderId != null and crossProcessBreakingDTO.orderId != ''">
- and o.order_id regexp #{crossProcessBreakingDTO.orderId}
+ and o.order_id like concat('%', #{crossProcessBreakingDTO.orderId}, '%')
</if>
<if test="crossProcessBreakingDTO.responsiblePersonnel != null and crossProcessBreakingDTO.responsiblePersonnel != ''">
- and dd.responsible_personnel regexp #{crossProcessBreakingDTO.responsiblePersonnel}
+ and dd.responsible_personnel like concat('%', #{crossProcessBreakingDTO.responsiblePersonnel}, '%')
</if>
<if test="crossProcessBreakingDTO.creator != null and crossProcessBreakingDTO.creator != ''">
- and rw.creator regexp #{crossProcessBreakingDTO.creator}
+ and rw.creator like concat('%', #{crossProcessBreakingDTO.creator}, '%')
</if>
<if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
- and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{crossProcessBreakingDTO.code}
+ and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') like concat('%', #{crossProcessBreakingDTO.code}, '%')
</if>
<if test="crossProcessBreakingDTO.reportingWorkId != null and crossProcessBreakingDTO.reportingWorkId != ''">
- and rw.reporting_work_id regexp #{crossProcessBreakingDTO.reportingWorkId}
+ and rw.reporting_work_id like concat('%', #{crossProcessBreakingDTO.reportingWorkId}, '%')
+ </if>
+ <if test="crossProcessBreakingDTO.childWidth != null and crossProcessBreakingDTO.childWidth != ''">
+ and ogd.child_width regexp REGEXP_REPLACE(#{crossProcessBreakingDTO.childWidth},'\\.0+$','')
+ </if>
+ <if test="crossProcessBreakingDTO.childHeight != null and crossProcessBreakingDTO.childHeight != ''">
+ and ogd.child_height regexp REGEXP_REPLACE(#{crossProcessBreakingDTO.childHeight},'\\.0+$','')
+ </if>
+ <if test="crossProcessBreakingDTO.thickness != null and crossProcessBreakingDTO.thickness != ''">
+ and JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) like concat('%', #{crossProcessBreakingDTO.thickness}, '%')
</if>
GROUP BY dd.id
order by dd.id desc
@@ -431,40 +458,52 @@
and rw.reviewed_state>=0
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}
+ and JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) like concat('%', #{crossProcessBreakingDTO.code}, '%')
</if>
<if test="crossProcessBreakingDTO.processId != null and crossProcessBreakingDTO.processId != ''">
- and rw.process_id regexp #{crossProcessBreakingDTO.processId}
+ and rw.process_id like concat('%', #{crossProcessBreakingDTO.processId}, '%')
</if>
<if test="crossProcessBreakingDTO.thisProcess != null and crossProcessBreakingDTO.thisProcess != ''">
- and rw.this_process regexp #{crossProcessBreakingDTO.thisProcess}
+ and rw.this_process like concat('%', #{crossProcessBreakingDTO.thisProcess}, '%')
</if>
<if test="crossProcessBreakingDTO.responsibleProcess != null and crossProcessBreakingDTO.responsibleProcess != ''">
- and dd.responsible_process regexp #{crossProcessBreakingDTO.responsibleProcess}
+ and dd.responsible_process like concat('%', #{crossProcessBreakingDTO.responsibleProcess}, '%')
</if>
<if test="crossProcessBreakingDTO.responsibleTeam != null and crossProcessBreakingDTO.responsibleTeam != ''">
- and dd.responsible_team regexp #{crossProcessBreakingDTO.responsibleTeam}
+ and dd.responsible_team like concat('%', #{crossProcessBreakingDTO.responsibleTeam}, '%')
</if>
<if test="crossProcessBreakingDTO.glassChild != null and crossProcessBreakingDTO.glassChild != ''">
- and ogd.glass_child regexp #{crossProcessBreakingDTO.glassChild}
+ and ogd.glass_child like concat('%', #{crossProcessBreakingDTO.glassChild}, '%')
</if>
<if test="crossProcessBreakingDTO.breakageType != null and crossProcessBreakingDTO.breakageType != ''">
- and dd.breakage_type regexp #{crossProcessBreakingDTO.breakageType}
+ and dd.breakage_type like concat('%', #{crossProcessBreakingDTO.breakageType}, '%')
</if>
<if test="crossProcessBreakingDTO.project != null and crossProcessBreakingDTO.project != ''">
- and o.project regexp #{crossProcessBreakingDTO.project}
+ and o.project like concat('%', #{crossProcessBreakingDTO.project}, '%')
</if>
<if test="crossProcessBreakingDTO.orderId != null and crossProcessBreakingDTO.orderId != ''">
- and o.order_id regexp #{crossProcessBreakingDTO.orderId}
+ and o.order_id like concat('%', #{crossProcessBreakingDTO.orderId}, '%')
</if>
<if test="crossProcessBreakingDTO.responsiblePersonnel != null and crossProcessBreakingDTO.responsiblePersonnel != ''">
- and dd.responsible_personnel regexp #{crossProcessBreakingDTO.responsiblePersonnel}
+ and dd.responsible_personnel like concat('%', #{crossProcessBreakingDTO.responsiblePersonnel}, '%')
+ </if>
+ <if test="crossProcessBreakingDTO.creator != null and crossProcessBreakingDTO.creator != ''">
+ and rw.creator like concat('%', #{crossProcessBreakingDTO.creator}, '%')
</if>
<if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
- and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{crossProcessBreakingDTO.code}
+ and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') like concat('%', #{crossProcessBreakingDTO.code}, '%')
</if>
<if test="crossProcessBreakingDTO.reportingWorkId != null and crossProcessBreakingDTO.reportingWorkId != ''">
- and rw.reporting_work_id regexp #{crossProcessBreakingDTO.reportingWorkId}
+ and rw.reporting_work_id like concat('%', #{crossProcessBreakingDTO.reportingWorkId}, '%')
+ </if>
+ <if test="crossProcessBreakingDTO.childWidth != null and crossProcessBreakingDTO.childWidth != ''">
+ and ogd.child_width regexp REGEXP_REPLACE(#{crossProcessBreakingDTO.childWidth},'\\.0+$','')
+ </if>
+ <if test="crossProcessBreakingDTO.childHeight != null and crossProcessBreakingDTO.childHeight != ''">
+ and ogd.child_height regexp REGEXP_REPLACE(#{crossProcessBreakingDTO.childHeight},'\\.0+$','')
+ </if>
+ <if test="crossProcessBreakingDTO.thickness != null and crossProcessBreakingDTO.thickness != ''">
+ and JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) like concat('%', #{crossProcessBreakingDTO.thickness}, '%')
</if>
order by dd.id desc
</select>
@@ -488,37 +527,52 @@
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}
+ and JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) like concat('%', #{crossProcessBreakingDTO.code}, '%')
</if>
<if test="crossProcessBreakingDTO.processId != null and crossProcessBreakingDTO.processId != ''">
- and rw.process_id regexp #{crossProcessBreakingDTO.processId}
+ and rw.process_id like concat('%', #{crossProcessBreakingDTO.processId}, '%')
</if>
<if test="crossProcessBreakingDTO.thisProcess != null and crossProcessBreakingDTO.thisProcess != ''">
- and rw.this_process regexp #{crossProcessBreakingDTO.thisProcess}
+ and rw.this_process like concat('%', #{crossProcessBreakingDTO.thisProcess}, '%')
</if>
<if test="crossProcessBreakingDTO.responsibleProcess != null and crossProcessBreakingDTO.responsibleProcess != ''">
- and dd.responsible_process regexp #{crossProcessBreakingDTO.responsibleProcess}
+ and dd.responsible_process like concat('%', #{crossProcessBreakingDTO.responsibleProcess}, '%')
</if>
<if test="crossProcessBreakingDTO.responsibleTeam != null and crossProcessBreakingDTO.responsibleTeam != ''">
- and dd.responsible_team regexp #{crossProcessBreakingDTO.responsibleTeam}
+ and dd.responsible_team like concat('%', #{crossProcessBreakingDTO.responsibleTeam}, '%')
</if>
<if test="crossProcessBreakingDTO.glassChild != null and crossProcessBreakingDTO.glassChild != ''">
- and ogd.glass_child regexp #{crossProcessBreakingDTO.glassChild}
+ and ogd.glass_child like concat('%', #{crossProcessBreakingDTO.glassChild}, '%')
</if>
<if test="crossProcessBreakingDTO.breakageType != null and crossProcessBreakingDTO.breakageType != ''">
- and dd.breakage_type regexp #{crossProcessBreakingDTO.breakageType}
+ and dd.breakage_type like concat('%', #{crossProcessBreakingDTO.breakageType}, '%')
</if>
<if test="crossProcessBreakingDTO.project != null and crossProcessBreakingDTO.project != ''">
- and o.project regexp #{crossProcessBreakingDTO.project}
+ and o.project like concat('%', #{crossProcessBreakingDTO.project}, '%')
</if>
<if test="crossProcessBreakingDTO.orderId != null and crossProcessBreakingDTO.orderId != ''">
- and o.order_id regexp #{crossProcessBreakingDTO.orderId}
+ and o.order_id like concat('%', #{crossProcessBreakingDTO.orderId}, '%')
</if>
<if test="crossProcessBreakingDTO.responsiblePersonnel != null and crossProcessBreakingDTO.responsiblePersonnel != ''">
- and dd.responsible_personnel regexp #{crossProcessBreakingDTO.responsiblePersonnel}
+ and dd.responsible_personnel like concat('%', #{crossProcessBreakingDTO.responsiblePersonnel}, '%')
+ </if>
+ <if test="crossProcessBreakingDTO.creator != null and crossProcessBreakingDTO.creator != ''">
+ and rw.creator like concat('%', #{crossProcessBreakingDTO.creator}, '%')
</if>
<if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
- and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{crossProcessBreakingDTO.code}
+ and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') like concat('%', #{crossProcessBreakingDTO.code}, '%')
+ </if>
+ <if test="crossProcessBreakingDTO.reportingWorkId != null and crossProcessBreakingDTO.reportingWorkId != ''">
+ and rw.reporting_work_id like concat('%', #{crossProcessBreakingDTO.reportingWorkId}, '%')
+ </if>
+ <if test="crossProcessBreakingDTO.childWidth != null and crossProcessBreakingDTO.childWidth != ''">
+ and ogd.child_width regexp REGEXP_REPLACE(#{crossProcessBreakingDTO.childWidth},'\\.0+$','')
+ </if>
+ <if test="crossProcessBreakingDTO.childHeight != null and crossProcessBreakingDTO.childHeight != ''">
+ and ogd.child_height regexp REGEXP_REPLACE(#{crossProcessBreakingDTO.childHeight},'\\.0+$','')
+ </if>
+ <if test="crossProcessBreakingDTO.thickness != null and crossProcessBreakingDTO.thickness != ''">
+ and JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) like concat('%', #{crossProcessBreakingDTO.thickness}, '%')
</if>
order by dd.id desc
</select>
@@ -723,7 +777,8 @@
fc.quantity - odpd.reporting_work_num - ifnull(fc.termination_quantity,0) as incompleteNum,
ROUND(ogd.child_width * ogd.child_height * (fc.quantity - odpd.reporting_work_num- ifnull(fc.termination_quantity,0)) / 1000000,
2) as incompleteArea,
- od.product_name
+ od.product_name,
+ JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) AS thickness
from sd.order_detail AS od
LEFT JOIN sd.order_glass_detail AS ogd
@@ -741,6 +796,7 @@
and odpd.process_id = fc.process_id
left join sd.`order` as o
on o.order_id = od.order_id
+ left join sd.product_detail as pd on pd.prod_id=od.product_id
where o.create_order>0
and odpd.process = #{selectProcesses}
and o.create_time >= #{selectTime1}
@@ -777,7 +833,10 @@
ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') AS glassNumber,
rw.this_process,
rw.creator,
- rw.reporting_work_id
+ rw.reporting_work_id,
+ JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) AS thickness,
+ ROUND(round( ogd.child_width * ogd.child_height * dd.breakage_quantity / 1000000, 2 )
+ * SUBSTRING_INDEX(IFNULL(JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')), '0'), 'mm', 1),2) AS pingfang
FROM
sd.ORDER AS o
LEFT JOIN sd.order_glass_detail AS ogd ON ogd.order_id = o.order_id
@@ -786,55 +845,65 @@
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
+ left join sd.product_detail as pd on pd.prod_id=od.product_id
WHERE
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}
+ and o.order_id like concat('%', #{damageReportDTO.orderId}, '%')
</if>
<if test="damageReportDTO.project != null and damageReportDTO.project != ''">
- and o.project regexp #{damageReportDTO.project}
+ and o.project like concat('%', #{damageReportDTO.project}, '%')
</if>
<if test="damageReportDTO.processId != null and damageReportDTO.processId != ''">
- and rw.process_id regexp #{damageReportDTO.processId}
+ and rw.process_id like concat('%', #{damageReportDTO.processId}, '%')
</if>
<if test="damageReportDTO.orderNumber != null and damageReportDTO.orderNumber != ''">
- and dd.order_number regexp #{damageReportDTO.orderNumber}
+ and dd.order_number like concat('%', #{damageReportDTO.orderNumber}, '%')
</if>
<if test="damageReportDTO.technologyNumber != null and damageReportDTO.technologyNumber != ''">
- and dd.technology_number regexp #{damageReportDTO.technologyNumber}
+ and dd.technology_number like concat('%', #{damageReportDTO.technologyNumber}, '%')
</if>
<if test="damageReportDTO.responsibleProcess != null and damageReportDTO.responsibleProcess != ''">
- and dd.responsible_process regexp #{damageReportDTO.responsibleProcess}
+ and dd.responsible_process like concat('%', #{damageReportDTO.responsibleProcess}, '%')
</if>
<if test="damageReportDTO.responsibleTeam != null and damageReportDTO.responsibleTeam != ''">
- and dd.responsible_team regexp #{damageReportDTO.responsibleTeam}
+ and dd.responsible_team like concat('%', #{damageReportDTO.responsibleTeam}, '%')
</if>
<if test="damageReportDTO.responsibleEquipment != null and damageReportDTO.responsibleEquipment != ''">
- and dd.responsible_equipment regexp #{damageReportDTO.responsibleEquipment}
+ and dd.responsible_equipment like concat('%', #{damageReportDTO.responsibleEquipment}, '%')
</if>
<if test="damageReportDTO.breakageType != null and damageReportDTO.breakageType != ''">
- and dd.breakage_type regexp #{damageReportDTO.breakageType}
+ and dd.breakage_type like concat('%', #{damageReportDTO.breakageType}, '%')
</if>
<if test="damageReportDTO.breakageReason != null and damageReportDTO.breakageReason != ''">
- and dd.breakage_reason regexp #{damageReportDTO.breakageReason}
+ and dd.breakage_reason like concat('%', #{damageReportDTO.breakageReason}, '%')
</if>
<if test="damageReportDTO.glassChild != null and damageReportDTO.glassChild != ''">
- and ogd.glass_child regexp #{damageReportDTO.glassChild}
+ and ogd.glass_child like concat('%', #{damageReportDTO.glassChild}, '%')
</if>
<if test="damageReportDTO.glassNumber != null and damageReportDTO.glassNumber != ''">
- and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{damageReportDTO.glassNumber}
+ and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') like concat('%', #{damageReportDTO.glassNumber}, '%')
</if>
<if test="damageReportDTO.thisProcess != null and damageReportDTO.thisProcess != ''">
- and rw.this_process regexp #{damageReportDTO.thisProcess}
+ and rw.this_process like concat('%', #{damageReportDTO.thisProcess}, '%')
</if>
<if test="damageReportDTO.creator != null and damageReportDTO.creator != ''">
- and rw.creator regexp #{damageReportDTO.creator}
+ and rw.creator like concat('%', #{damageReportDTO.creator}, '%')
</if>
<if test="damageReportDTO.reportingWorkId != null and damageReportDTO.reportingWorkId != ''">
- and rw.reporting_work_id regexp #{damageReportDTO.reportingWorkId}
+ and rw.reporting_work_id like concat('%', #{damageReportDTO.reportingWorkId}, '%')
+ </if>
+ <if test="damageReportDTO.childWidth != null and damageReportDTO.childWidth != ''">
+ and ogd.child_width regexp REGEXP_REPLACE(#{damageReportDTO.childWidth},'\\.0+$','')
+ </if>
+ <if test="damageReportDTO.childHeight != null and damageReportDTO.childHeight != ''">
+ and ogd.child_height regexp REGEXP_REPLACE(#{damageReportDTO.childHeight},'\\.0+$','')
+ </if>
+ <if test="damageReportDTO.thickness != null and damageReportDTO.thickness != ''">
+ and JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) like concat('%', #{damageReportDTO.thickness}, '%')
</if>
GROUP BY
dd.id
@@ -852,42 +921,65 @@
LEFT JOIN pp.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
+ left join sd.product_detail as pd on pd.prod_id=od.product_id
WHERE
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}
+ and o.order_id like concat('%', #{damageReportDTO.orderId}, '%')
</if>
<if test="damageReportDTO.project != null and damageReportDTO.project != ''">
- and o.project regexp #{damageReportDTO.project}
+ and o.project like concat('%', #{damageReportDTO.project}, '%')
</if>
<if test="damageReportDTO.processId != null and damageReportDTO.processId != ''">
- and rw.process_id regexp #{damageReportDTO.processId}
+ and rw.process_id like concat('%', #{damageReportDTO.processId}, '%')
</if>
<if test="damageReportDTO.orderNumber != null and damageReportDTO.orderNumber != ''">
- and dd.order_number regexp #{damageReportDTO.orderNumber}
+ and dd.order_number like concat('%', #{damageReportDTO.orderNumber}, '%')
</if>
<if test="damageReportDTO.technologyNumber != null and damageReportDTO.technologyNumber != ''">
- and dd.technology_number regexp #{damageReportDTO.technologyNumber}
+ and dd.technology_number like concat('%', #{damageReportDTO.technologyNumber}, '%')
</if>
<if test="damageReportDTO.responsibleProcess != null and damageReportDTO.responsibleProcess != ''">
- and dd.responsible_process regexp #{damageReportDTO.responsibleProcess}
+ and dd.responsible_process like concat('%', #{damageReportDTO.responsibleProcess}, '%')
</if>
<if test="damageReportDTO.responsibleTeam != null and damageReportDTO.responsibleTeam != ''">
- and dd.responsible_team regexp #{damageReportDTO.responsibleTeam}
+ and dd.responsible_team like concat('%', #{damageReportDTO.responsibleTeam}, '%')
</if>
<if test="damageReportDTO.responsibleEquipment != null and damageReportDTO.responsibleEquipment != ''">
- and dd.responsible_equipment regexp #{damageReportDTO.responsibleEquipment}
+ and dd.responsible_equipment like concat('%', #{damageReportDTO.responsibleEquipment}, '%')
</if>
<if test="damageReportDTO.breakageType != null and damageReportDTO.breakageType != ''">
- and dd.breakage_type regexp #{damageReportDTO.breakageType}
+ and dd.breakage_type like concat('%', #{damageReportDTO.breakageType}, '%')
</if>
<if test="damageReportDTO.breakageReason != null and damageReportDTO.breakageReason != ''">
- and dd.breakage_reason regexp #{damageReportDTO.breakageReason}
+ and dd.breakage_reason like concat('%', #{damageReportDTO.breakageReason}, '%')
</if>
<if test="damageReportDTO.glassChild != null and damageReportDTO.glassChild != ''">
- and ogd.glass_child regexp #{damageReportDTO.glassChild}
+ and ogd.glass_child like concat('%', #{damageReportDTO.glassChild}, '%')
+ </if>
+ <if test="damageReportDTO.glassNumber != null and damageReportDTO.glassNumber != ''">
+ and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') like concat('%', #{damageReportDTO.glassNumber}, '%')
+ </if>
+ <if test="damageReportDTO.thisProcess != null and damageReportDTO.thisProcess != ''">
+ and rw.this_process like concat('%', #{damageReportDTO.thisProcess}, '%')
+ </if>
+ <if test="damageReportDTO.creator != null and damageReportDTO.creator != ''">
+ and rw.creator like concat('%', #{damageReportDTO.creator}, '%')
+ </if>
+ <if test="damageReportDTO.reportingWorkId != null and damageReportDTO.reportingWorkId != ''">
+ and rw.reporting_work_id like concat('%', #{damageReportDTO.reportingWorkId}, '%')
+ </if>
+ <if test="damageReportDTO.childWidth != null and damageReportDTO.childWidth != ''">
+ and ogd.child_width regexp REGEXP_REPLACE(#{damageReportDTO.childWidth},'\\.0+$','')
+ </if>
+ <if test="damageReportDTO.childHeight != null and damageReportDTO.childHeight != ''">
+ and ogd.child_height regexp REGEXP_REPLACE(#{damageReportDTO.childHeight},'\\.0+$','')
+ </if>
+ <if test="damageReportDTO.thickness != null and damageReportDTO.thickness != ''">
+ and JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) like concat('%', #{damageReportDTO.thickness}, '%')
</if>
limit #{offset},#{pageSize};
</select>
@@ -1266,7 +1358,10 @@
JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code,
CONCAT(rw.process_id,'/',GROUP_CONCAT(distinct dd.technology_number SEPARATOR '')) as process_id,
rw.creator,
- rw.reporting_work_id
+ rw.reporting_work_id,
+ ogd.child_width,
+ ogd.child_height,
+ JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) as thickness
from damage_details as dd
left join reporting_work as rw
on rw.reporting_work_id = dd.reporting_work_id
@@ -1303,7 +1398,10 @@
JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code,
CONCAT(rw.process_id,'/',GROUP_CONCAT(distinct dd.technology_number SEPARATOR '')) as process_id,
rw.creator,
- rw.reporting_work_id
+ rw.reporting_work_id,
+ ogd.child_width,
+ ogd.child_height,
+ JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) as thickness
from damage_details as dd
left join reporting_work as rw
on rw.reporting_work_id = dd.reporting_work_id
@@ -1345,7 +1443,10 @@
ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') AS glassNumber,
rw.this_process,
rw.creator,
- rw.reporting_work_id
+ rw.reporting_work_id,
+ JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) AS thickness,
+ ROUND(round( ogd.child_width * ogd.child_height * dd.breakage_quantity / 1000000, 2 )
+ * SUBSTRING_INDEX(IFNULL(JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')), '0'), 'mm', 1),2) AS pingfang
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
@@ -1353,6 +1454,7 @@
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
+ left join sd.product_detail as pd on pd.prod_id=od.product_id
WHERE rw.reporting_work_time >= #{dates[0]}
and rw.reporting_work_time <= #{dates[1]}
AND dd.available = 0 and rw.reviewed_state>=0
@@ -1425,7 +1527,8 @@
od.quantity - odpd.reporting_work_num as incompleteNum,
ROUND(ogd.child_width * ogd.child_height * (od.quantity - odpd.reporting_work_num) / 1000000,
2) as incompleteArea,
- od.product_name
+ od.product_name,
+ JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) AS thickness
from sd.order_detail AS od
LEFT JOIN sd.order_glass_detail AS ogd
@@ -1443,6 +1546,7 @@
and odpd.process_id = fc.process_id
left join sd.`order` as o
on o.order_id = od.order_id
+ left join sd.product_detail as pd on pd.prod_id=od.product_id
where o.create_order>0
and odpd.process = #{process}
and date(o.create_time) >= #{date[0]}
@@ -1670,6 +1774,7 @@
</select>
<select id="teamOutputMp" resultMap="teamOutputMap">
+
SELECT
t.*,
-- 鐜荤拑鎬诲帤搴︼紙mm锛�
@@ -1770,7 +1875,12 @@
<if test="teamOutputDTO.batch != null and teamOutputDTO.batch != ''">
AND o.batch REGEXP #{teamOutputDTO.batch}
</if>
-
+ <if test="teamOutputDTO.width != null and teamOutputDTO.width != ''">
+ and ogd.child_width regexp REGEXP_REPLACE(#{teamOutputDTO.width},'\\.0+$','')
+ </if>
+ <if test="teamOutputDTO.height != null and teamOutputDTO.height != ''">
+ and ogd.child_height regexp REGEXP_REPLACE(#{teamOutputDTO.height},'\\.0+$','')
+ </if>
<choose>
<when test="laminating == ''">
GROUP BY
@@ -1800,7 +1910,7 @@
</if>
HAVING 1 = 1
<if test="teamOutputDTO.thicknessSum != null and teamOutputDTO.thicknessSum != ''">
- AND thicknessSum REGEXP #{teamOutputDTO.thicknessSum}
+ and thicknessSum regexp REGEXP_REPLACE(#{teamOutputDTO.thicknessSum},'\\.0+$','')
</if>
ORDER BY
t.this_process,
@@ -1813,39 +1923,84 @@
<select id="exportTeamOutputMp">
SELECT
+ t.*,
+ -- 鐜荤拑鎬诲帤搴︼紙mm锛�
+ (
+ SELECT SUM(CAST(REGEXP_SUBSTR(seg, '^[0-9]+') AS UNSIGNED))
+ FROM JSON_TABLE(
+ CONCAT('["', REPLACE(t.workProcessName, '+', '","'), '"]'),
+ '$[*]' COLUMNS (seg VARCHAR(100) PATH '$')
+ ) jt
+ ) AS thicknessSum,
+ ROUND(
+ (
+ SELECT SUM(CAST(REGEXP_SUBSTR(seg, '^[0-9]+') AS UNSIGNED))
+ FROM JSON_TABLE(
+ CONCAT('["', REPLACE(t.workProcessName, '+', '","'), '"]'),
+ '$[*]' COLUMNS (seg VARCHAR(100) PATH '$')
+ ) jt2
+ ) * t.area,
+ 2
+ ) AS thicknessArea
+ FROM
+ (
+ SELECT
rw.reporting_work_time,
rw.this_process,
rw.teams_groups_name,
o.project,
+ o.order_id,
rw.process_id,
fc.order_number,
- MAX( ogd.child_width ) as width,
- MAX( ogd.child_height ) as height,
+ 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,
+ 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 )
+ 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]}
+ pp.reporting_work AS rw
+ LEFT JOIN pp.reporting_work_detail AS rwd
+ ON rwd.reporting_work_id = rw.reporting_work_id
+ LEFT JOIN pp.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="process != null and process != ''">
+ AND rw.this_process = #{process}
+ </when>
+ <!-- 鏈紶宸ュ簭锛氫笉鍔犻檺鍒讹紝鏌ユ墍鏈夛級 -->
+ <otherwise>
+ </otherwise>
+ </choose>
<choose>
<when test="laminating == ''">
GROUP BY
@@ -1858,7 +2013,7 @@
</when>
<otherwise>
GROUP BY
- <if test="laminating == 'stepA' || laminating == 'stepC'" >
+ <if test="laminating == 'stepA' || laminating == 'stepC'">
ogd.`group`,
</if>
rw.reporting_work_id,
@@ -1868,12 +2023,13 @@
rwd.order_number
</otherwise>
</choose>
+ ) t
ORDER BY
- rw.this_process,
- rw.process_id,
- rwd.order_number,
- rw.reporting_work_time,
- rw.teams_groups_name
+ t.this_process,
+ t.process_id,
+ t.order_number,
+ t.reporting_work_time,
+ t.teams_groups_name
</select>
<select id="teamOutputPageTotal">
@@ -1987,7 +2143,12 @@
<if test="teamOutputDTO.batch != null and teamOutputDTO.batch != ''">
AND o.batch REGEXP #{teamOutputDTO.batch}
</if>
-
+ <if test="teamOutputDTO.width != null and teamOutputDTO.width != ''">
+ and ogd.child_width regexp REGEXP_REPLACE(#{teamOutputDTO.width},'\\.0+$','')
+ </if>
+ <if test="teamOutputDTO.height != null and teamOutputDTO.height != ''">
+ and ogd.child_height regexp REGEXP_REPLACE(#{teamOutputDTO.height},'\\.0+$','')
+ </if>
<choose>
<when test="laminating == ''">
GROUP BY
@@ -2015,7 +2176,7 @@
) x
WHERE 1 = 1
<if test="teamOutputDTO.thicknessSum != null and teamOutputDTO.thicknessSum != ''">
- AND x.thicknessSum REGEXP #{teamOutputDTO.thicknessSum}
+ and thicknessSum regexp REGEXP_REPLACE(#{teamOutputDTO.thicknessSum},'\\.0+$','')
</if>
<if test="teamOutputDTO.thicknessArea != null and teamOutputDTO.thicknessArea != ''">
AND x.thicknessArea REGEXP #{teamOutputDTO.thicknessArea}
@@ -2410,10 +2571,9 @@
from
(
SELECT (od.quantity) AS quantity,
- d.numCounts + d.patchNumSum - d.numCount -d.broken_num as stockNum,
+ if(d.numCounts + d.patchNumSum - d.numCount -d.broken_num - fc.termination_quantity <0,0,d.numCounts + d.patchNumSum - d.numCount -d.broken_num - fc.termination_quantity) as stockNum,
ROUND(ogd.child_width * ogd.child_height *
- (d.numCounts + d.patchNumSum - d.numCount -
- d.broken_num) / 1000000, 2) as stockArea
+ (if(d.numCounts + d.patchNumSum - d.numCount -d.broken_num - fc.termination_quantity <0,0,d.numCounts + d.patchNumSum - d.numCount -d.broken_num - fc.termination_quantity)) / 1000000, 2) as stockArea
FROM
sd.order_detail AS od
LEFT JOIN sd.order_glass_detail AS ogd
@@ -2470,7 +2630,7 @@
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 if(d.numCounts + d.patchNumSum - d.numCount -d.broken_num - fc.termination_quantity <0,0,d.numCounts + d.patchNumSum - d.numCount -d.broken_num - fc.termination_quantity) != 0
and d.process!=SUBSTRING_INDEX(ogd.process, '->', 1)
and position(#{selectProcesses} in d.process)
and position(#{orderId} in od.order_id)
@@ -2478,29 +2638,48 @@
<if test="terminationVals != '1' and terminationVals != 1">
and fc.termination_status !=1
</if>
+ <if test="workInProgressDTO.thisProcess != null and workInProgressDTO.thisProcess != ''">
+ and d.process like concat('%', #{workInProgressDTO.thisProcess}, '%')
+ </if>
<if test="workInProgressDTO.customerName != null and workInProgressDTO.customerName != ''">
- and o.customer_name regexp #{workInProgressDTO.customerName}
+ and o.customer_name like concat('%', #{workInProgressDTO.customerName}, '%')
</if>
<if test="workInProgressDTO.project != null and workInProgressDTO.project != ''">
- and o.project regexp #{workInProgressDTO.project}
+ and o.project like concat('%', #{workInProgressDTO.project}, '%')
</if>
<if test="workInProgressDTO.orderId != null and workInProgressDTO.orderId != ''">
- and o.order_id regexp #{workInProgressDTO.orderId}
+ and o.order_id like concat('%', #{workInProgressDTO.orderId}, '%')
</if>
<if test="workInProgressDTO.batch != null and workInProgressDTO.batch != ''">
- and o.batch regexp #{workInProgressDTO.batch}
+ and o.batch like concat('%', #{workInProgressDTO.batch}, '%')
</if>
<if test="workInProgressDTO.processId != null and workInProgressDTO.processId != ''">
- and fc.process_id regexp #{workInProgressDTO.processId}
+ and fc.process_id like concat('%', #{workInProgressDTO.processId}, '%')
</if>
<if test="workInProgressDTO.orderNumber != null and workInProgressDTO.orderNumber != ''">
- and ogd.order_number regexp #{workInProgressDTO.orderNumber}
+ and ogd.order_number like concat('%', #{workInProgressDTO.orderNumber}, '%')
</if>
<if test="workInProgressDTO.technologyNumber != null and workInProgressDTO.technologyNumber != ''">
- and ogd.technology_number regexp #{workInProgressDTO.technologyNumber}
+ and ogd.technology_number like concat('%', #{workInProgressDTO.technologyNumber}, '%')
+ </if>
+ <if test="workInProgressDTO.quantity != null and workInProgressDTO.quantity != ''">
+ and od.quantity like concat('%', #{workInProgressDTO.quantity}, '%')
+ </if>
+ <if test="workInProgressDTO.childWidth != null and workInProgressDTO.childWidth != ''">
+ and ogd.child_width regexp REGEXP_REPLACE(#{workInProgressDTO.childWidth},'\\.0+$','')
+ </if>
+ <if test="workInProgressDTO.childHeight != null and workInProgressDTO.childHeight != ''">
+ and ogd.child_height regexp REGEXP_REPLACE(#{workInProgressDTO.childHeight},'\\.0+$','')
+ </if>
+ <if test="workInProgressDTO.stockNum != null and workInProgressDTO.stockNum != ''">
+ and (d.numCounts + d.patchNumSum - d.numCount -d.broken_num) like concat('%', #{workInProgressDTO.stockNum}, '%')
+ </if>
+ <if test="workInProgressDTO.stockArea != null and workInProgressDTO.stockArea != ''">
+ and ROUND(ogd.child_width * ogd.child_height * (d.numCounts + d.patchNumSum - d.numCount -
+ d.broken_num) / 1000000, 2) regexp REGEXP_REPLACE(#{workInProgressDTO.stockArea},'\\.0+$','')
</if>
<if test="workInProgressDTO.glassNumber != null and workInProgressDTO.glassNumber != ''">
- and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{workInProgressDTO.glassNumber}
+ and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') like concat('%', #{workInProgressDTO.glassNumber}, '%')
</if>
group by fc.process_id, fc.order_number, fc.technology_number,d.process
@@ -2546,7 +2725,9 @@
<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
+ ROUND(SUM(ogd.child_width * ogd.child_height * dd.breakage_quantity) / 1000000, 2) AS area,
+ SUM(ROUND(round( ogd.child_width * ogd.child_height * dd.breakage_quantity / 1000000, 2 )
+ * SUBSTRING_INDEX(IFNULL(JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')), '0'), 'mm', 1),2)) AS pingfang
FROM
sd.ORDER AS o
LEFT JOIN sd.order_glass_detail AS ogd ON ogd.order_id = o.order_id
@@ -2556,45 +2737,64 @@
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
+ left join sd.product_detail as pd on pd.prod_id=od.product_id
WHERE
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}
+ and o.order_id like concat('%', #{damageReportDTO.orderId}, '%')
</if>
<if test="damageReportDTO.project != null and damageReportDTO.project != ''">
- and o.project regexp #{damageReportDTO.project}
+ and o.project like concat('%', #{damageReportDTO.project}, '%')
</if>
<if test="damageReportDTO.processId != null and damageReportDTO.processId != ''">
- and rw.process_id regexp #{damageReportDTO.processId}
+ and rw.process_id like concat('%', #{damageReportDTO.processId}, '%')
</if>
<if test="damageReportDTO.orderNumber != null and damageReportDTO.orderNumber != ''">
- and dd.order_number regexp #{damageReportDTO.orderNumber}
+ and dd.order_number like concat('%', #{damageReportDTO.orderNumber}, '%')
</if>
<if test="damageReportDTO.technologyNumber != null and damageReportDTO.technologyNumber != ''">
- and dd.technology_number regexp #{damageReportDTO.technologyNumber}
+ and dd.technology_number like concat('%', #{damageReportDTO.technologyNumber}, '%')
</if>
<if test="damageReportDTO.responsibleProcess != null and damageReportDTO.responsibleProcess != ''">
- and dd.responsible_process regexp #{damageReportDTO.responsibleProcess}
+ and dd.responsible_process like concat('%', #{damageReportDTO.responsibleProcess}, '%')
</if>
<if test="damageReportDTO.responsibleTeam != null and damageReportDTO.responsibleTeam != ''">
- and dd.responsible_team regexp #{damageReportDTO.responsibleTeam}
+ and dd.responsible_team like concat('%', #{damageReportDTO.responsibleTeam}, '%')
</if>
<if test="damageReportDTO.responsibleEquipment != null and damageReportDTO.responsibleEquipment != ''">
- and dd.responsible_equipment regexp #{damageReportDTO.responsibleEquipment}
+ and dd.responsible_equipment like concat('%', #{damageReportDTO.responsibleEquipment}, '%')
</if>
<if test="damageReportDTO.breakageType != null and damageReportDTO.breakageType != ''">
- and dd.breakage_type regexp #{damageReportDTO.breakageType}
+ and dd.breakage_type like concat('%', #{damageReportDTO.breakageType}, '%')
</if>
<if test="damageReportDTO.breakageReason != null and damageReportDTO.breakageReason != ''">
- and dd.breakage_reason regexp #{damageReportDTO.breakageReason}
+ and dd.breakage_reason like concat('%', #{damageReportDTO.breakageReason}, '%')
</if>
<if test="damageReportDTO.glassChild != null and damageReportDTO.glassChild != ''">
- and ogd.glass_child regexp #{damageReportDTO.glassChild}
+ and ogd.glass_child like concat('%', #{damageReportDTO.glassChild}, '%')
</if>
<if test="damageReportDTO.glassNumber != null and damageReportDTO.glassNumber != ''">
- and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{damageReportDTO.glassNumber}
+ and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') like concat('%', #{damageReportDTO.glassNumber}, '%')
+ </if>
+ <if test="damageReportDTO.thisProcess != null and damageReportDTO.thisProcess != ''">
+ and rw.this_process like concat('%', #{damageReportDTO.thisProcess}, '%')
+ </if>
+ <if test="damageReportDTO.creator != null and damageReportDTO.creator != ''">
+ and rw.creator like concat('%', #{damageReportDTO.creator}, '%')
+ </if>
+ <if test="damageReportDTO.reportingWorkId != null and damageReportDTO.reportingWorkId != ''">
+ and rw.reporting_work_id like concat('%', #{damageReportDTO.reportingWorkId}, '%')
+ </if>
+ <if test="damageReportDTO.childWidth != null and damageReportDTO.childWidth != ''">
+ and ogd.child_width regexp REGEXP_REPLACE(#{damageReportDTO.childWidth},'\\.0+$','')
+ </if>
+ <if test="damageReportDTO.childHeight != null and damageReportDTO.childHeight != ''">
+ and ogd.child_height regexp REGEXP_REPLACE(#{damageReportDTO.childHeight},'\\.0+$','')
+ </if>
+ <if test="damageReportDTO.thickness != null and damageReportDTO.thickness != ''">
+ and JSON_UNQUOTE(JSON_EXTRACT(pd.separation, '$.thickness')) like concat('%', #{damageReportDTO.thickness}, '%')
</if>
</select>
@@ -2714,6 +2914,12 @@
<if test="teamOutputDTO.batch != null and teamOutputDTO.batch != ''">
AND o.batch REGEXP #{teamOutputDTO.batch}
</if>
+ <if test="teamOutputDTO.width != null and teamOutputDTO.width != ''">
+ and ogd.child_width regexp REGEXP_REPLACE(#{teamOutputDTO.width},'\\.0+$','')
+ </if>
+ <if test="teamOutputDTO.height != null and teamOutputDTO.height != ''">
+ and ogd.child_height regexp REGEXP_REPLACE(#{teamOutputDTO.height},'\\.0+$','')
+ </if>
<choose>
<when test="laminating == ''">
GROUP BY
@@ -2744,7 +2950,7 @@
) x
WHERE 1 = 1
<if test="teamOutputDTO.thicknessSum != null and teamOutputDTO.thicknessSum != ''">
- AND x.thicknessSum REGEXP #{teamOutputDTO.thicknessSum}
+ and thicknessSum regexp REGEXP_REPLACE(#{teamOutputDTO.thicknessSum},'\\.0+$','')
</if>
<if test="teamOutputDTO.thicknessArea != null and teamOutputDTO.thicknessArea != ''">
AND x.thicknessArea REGEXP #{teamOutputDTO.thicknessArea}
@@ -2773,10 +2979,9 @@
od.quantity,
ogd.child_width,
ogd.child_height,
- d.numCounts + d.patchNumSum - d.numCount -d.broken_num as stockNum,
+ if(d.numCounts + d.patchNumSum - d.numCount -d.broken_num-ifnull(fc.termination_quantity,0)<0,0,d.numCounts + d.patchNumSum - d.numCount -d.broken_num-ifnull(fc.termination_quantity,0)) as stockNum,
ROUND(ogd.child_width * ogd.child_height *
- (d.numCounts + d.patchNumSum - d.numCount -
- d.broken_num) / 1000000, 2) as stockArea,
+ (if(d.numCounts + d.patchNumSum - d.numCount -d.broken_num-ifnull(fc.termination_quantity,0)<0,0,d.numCounts + d.patchNumSum - d.numCount -d.broken_num-ifnull(fc.termination_quantity,0))) / 1000000, 2) as stockArea,
od.product_name,
od.bend_radius,
ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') AS glassNumber
@@ -2835,7 +3040,7 @@
left join sd.`order` as o on o.order_id=od.order_id
LEFT JOIN sd.basic_data AS bd ON bd.basic_name = d.process
where o.create_order>0
- and d.numCounts +d.patchNumSum - d.numCount - d.broken_num != 0
+ and if(d.numCounts + d.patchNumSum - d.numCount -d.broken_num-ifnull(fc.termination_quantity,0)<0,0,d.numCounts + d.patchNumSum - d.numCount -d.broken_num-ifnull(fc.termination_quantity,0)) != 0
and d.process!=SUBSTRING_INDEX(ogd.process, '->', 1)
and position(#{orderId} in od.order_id)
and position(#{inputProject} in o.project)
@@ -2843,47 +3048,47 @@
and fc.termination_status !=1
</if>
<if test="workInProgressDTO.thisProcess != null and workInProgressDTO.thisProcess != ''">
- and d.process regexp #{workInProgressDTO.thisProcess}
+ and d.process like concat('%', #{workInProgressDTO.thisProcess}, '%')
</if>
<if test="workInProgressDTO.customerName != null and workInProgressDTO.customerName != ''">
- and o.customer_name regexp #{workInProgressDTO.customerName}
+ and o.customer_name like concat('%', #{workInProgressDTO.customerName}, '%')
</if>
<if test="workInProgressDTO.project != null and workInProgressDTO.project != ''">
- and o.project regexp #{workInProgressDTO.project}
+ and o.project like concat('%', #{workInProgressDTO.project}, '%')
</if>
<if test="workInProgressDTO.orderId != null and workInProgressDTO.orderId != ''">
- and o.order_id regexp #{workInProgressDTO.orderId}
+ and o.order_id like concat('%', #{workInProgressDTO.orderId}, '%')
</if>
<if test="workInProgressDTO.batch != null and workInProgressDTO.batch != ''">
- and o.batch regexp #{workInProgressDTO.batch}
+ and o.batch like concat('%', #{workInProgressDTO.batch}, '%')
</if>
<if test="workInProgressDTO.processId != null and workInProgressDTO.processId != ''">
- and fc.process_id regexp #{workInProgressDTO.processId}
+ and fc.process_id like concat('%', #{workInProgressDTO.processId}, '%')
</if>
<if test="workInProgressDTO.orderNumber != null and workInProgressDTO.orderNumber != ''">
- and ogd.order_number regexp #{workInProgressDTO.orderNumber}
+ and ogd.order_number like concat('%', #{workInProgressDTO.orderNumber}, '%')
</if>
<if test="workInProgressDTO.technologyNumber != null and workInProgressDTO.technologyNumber != ''">
- and ogd.technology_number regexp #{workInProgressDTO.technologyNumber}
+ and ogd.technology_number like concat('%', #{workInProgressDTO.technologyNumber}, '%')
</if>
<if test="workInProgressDTO.quantity != null and workInProgressDTO.quantity != ''">
- and od.quantity regexp #{workInProgressDTO.quantity}
+ and od.quantity like concat('%', #{workInProgressDTO.quantity}, '%')
</if>
<if test="workInProgressDTO.childWidth != null and workInProgressDTO.childWidth != ''">
- and ogd.child_width regexp #{workInProgressDTO.childWidth}
+ and ogd.child_width regexp REGEXP_REPLACE(#{workInProgressDTO.childWidth},'\\.0+$','')
</if>
<if test="workInProgressDTO.childHeight != null and workInProgressDTO.childHeight != ''">
- and ogd.child_height regexp #{workInProgressDTO.childHeight}
+ and ogd.child_height regexp REGEXP_REPLACE(#{workInProgressDTO.childHeight},'\\.0+$','')
</if>
<if test="workInProgressDTO.stockNum != null and workInProgressDTO.stockNum != ''">
- and (d.numCounts + d.patchNumSum - d.numCount -d.broken_num) regexp #{workInProgressDTO.stockNum}
+ and (d.numCounts + d.patchNumSum - d.numCount -d.broken_num) like concat('%', #{workInProgressDTO.stockNum}, '%')
</if>
<if test="workInProgressDTO.stockArea != null and workInProgressDTO.stockArea != ''">
and ROUND(ogd.child_width * ogd.child_height * (d.numCounts + d.patchNumSum - d.numCount -
- d.broken_num) / 1000000, 2) regexp #{workInProgressDTO.stockArea}
+ d.broken_num) / 1000000, 2) regexp REGEXP_REPLACE(#{workInProgressDTO.stockArea},'\\.0+$','')
</if>
<if test="workInProgressDTO.glassNumber != null and workInProgressDTO.glassNumber != ''">
- and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{workInProgressDTO.glassNumber}
+ and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') like concat('%', #{workInProgressDTO.glassNumber}, '%')
</if>
<choose>
<when test="laminating != null and laminating == 'stepC'">
@@ -3254,8 +3459,10 @@
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
+ if(e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num-f.termination_quantity<0,
+ 0,e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num-f.termination_quantity) as quantity,
+ round(if(e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num-f.termination_quantity<0,0,
+ e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num-f.termination_quantity)*f.area/1000000,2) as glassArea
from (SELECT a.order_id,
if(a.batch!="",CONCAT(a.project,'(',a.batch,')'),a.project) as project,
C.product_id,
@@ -3266,9 +3473,10 @@
d.`group` ,
b.broken_num,
b.id,
- c.area,
+ d.child_width * d.child_height as area,
d.glass_child,
- ifnull(cb.patchNumSum,0) as patchNumSum
+ ifnull(cb.patchNumSum,0) as patchNumSum,
+ fc.termination_quantity
FROM sd.`order` as a
LEFT JOIN sd.order_process_detail as b
@@ -3314,7 +3522,7 @@
f.technology_number ORDER BY f.process_id, f.order_number,
f.technology_number) as g
<choose>
- <when test="laminating == 'stepC' and process == '棰勫帇'">
+ <when test="laminating == 'stepB'">
GROUP BY g.process_id, g.order_number, g.technology_number
</when>
<when test="laminating == 'stepC'">
@@ -3330,6 +3538,7 @@
) as h
+ where h.quantity >0
<choose>
<when test="optionVal == 1">
GROUP BY thisProcess
@@ -3349,8 +3558,8 @@
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
+ if(e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num-f.termination_quantity<0,0,e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num-f.termination_quantity) as quantity,
+ round(if(e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num-f.termination_quantity<0,0,e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num-f.termination_quantity)*f.area/1000000,2) as glassArea
from (SELECT a.order_id,
a.project,
C.product_id,
@@ -3361,9 +3570,10 @@
d.`group` ,
b.broken_num,
b.id,
- c.area,
+ d.child_width * d.child_height as area,
d.glass_child,
- ifnull(cb.patchNumSum,0) as patchNumSum
+ ifnull(cb.patchNumSum,0) as patchNumSum,
+ fc.termination_quantity
FROM sd.`order` as a
LEFT JOIN sd.order_process_detail as b
@@ -3405,10 +3615,11 @@
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 group by f.process_id, f.order_number,
+ and (e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num)>0 group by f.process_id, f.order_number,
+ f.technology_number ORDER BY f.process_id, f.order_number,
f.technology_number) as g
<choose>
- <when test="laminating == 'stepC' and process == '棰勫帇'">
+ <when test="laminating == 'stepB'">
GROUP BY g.process_id, g.order_number, g.technology_number
</when>
<when test="laminating == 'stepC'">
@@ -3499,7 +3710,7 @@
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 == '棰勫帇'">
+ <when test="laminating == 'stepB'">
GROUP BY g.process_id, g.order_number, g.technology_number
</when>
<when test="laminating == 'stepC'">
--
Gitblit v1.8.0