From 70a9b5ca60bafe50da533513f99b990147968a93 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 09 十二月 2025 10:11:47 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 609 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 437 insertions(+), 172 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 7099592..03253e7 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -132,6 +132,8 @@
<result column="workProcessName" property="workProcessName"/>
<result column="device_name" property="deviceName"/>
<result column="order_type" property="orderType"/>
+ <result column="thicknessSum" property="thicknessSum"/>
+ <result column="thicknessArea" property="thicknessArea"/>
</resultMap>
<resultMap id="scheduleProductionScheduleMap" type="com.example.erp.dto.pp.ScheduleProductionScheduleDTO">
@@ -291,43 +293,43 @@
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>
GROUP BY dd.id
order by dd.id desc
@@ -367,43 +369,43 @@
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>
GROUP BY dd.id
order by dd.id desc
@@ -429,40 +431,43 @@
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>
order by dd.id desc
</select>
@@ -486,37 +491,43 @@
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>
order by dd.id desc
</select>
@@ -721,7 +732,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
@@ -739,6 +751,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}
@@ -790,49 +803,55 @@
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>
GROUP BY
dd.id
@@ -850,42 +869,61 @@
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
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>
limit #{offset},#{pageSize};
</select>
@@ -1668,8 +1706,27 @@
</select>
<select id="teamOutputMp" resultMap="teamOutputMap">
+
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
@@ -1750,7 +1807,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
@@ -1778,6 +1840,10 @@
<if test="teamOutputDTO.workProcessName != null and teamOutputDTO.workProcessName != ''">
AND t.workProcessName REGEXP #{teamOutputDTO.workProcessName}
</if>
+ HAVING 1 = 1
+ <if test="teamOutputDTO.thicknessSum != null and teamOutputDTO.thicknessSum != ''">
+ and thicknessSum regexp REGEXP_REPLACE(#{teamOutputDTO.thicknessSum},'\\.0+$','')
+ </if>
ORDER BY
t.this_process,
t.process_id,
@@ -1789,39 +1855,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
@@ -1834,7 +1945,7 @@
</when>
<otherwise>
GROUP BY
- <if test="laminating == 'stepA' || laminating == 'stepC'" >
+ <if test="laminating == 'stepA' || laminating == 'stepC'">
ogd.`group`,
</if>
rw.reporting_work_id,
@@ -1844,61 +1955,131 @@
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">
SELECT
- CEILING(count(*)/#{pageSize}) as 'pageTotal',
- count(*) as 'total'
- FROM
+ CEILING(COUNT(*) / #{pageSize}) AS pageTotal,
+ COUNT(*) AS total
+ FROM (
+
+ SELECT
+ t.*,
+
+ CASE
+ WHEN t.workProcessName IS NULL OR t.workProcessName = '' THEN 0
+ ELSE (
+ SELECT SUM(CAST(REGEXP_SUBSTR(seg, '^[0-9]+') AS UNSIGNED))
+ FROM JSON_TABLE(
+ CONCAT('["', REPLACE(t.workProcessName, '+', '","'), '"]'),
+ '$[*]' COLUMNS (seg VARCHAR(100) PATH '$')
+ ) jt
+ )
+ END AS thicknessSum,
+ CASE
+ WHEN t.workProcessName IS NULL OR t.workProcessName = '' THEN 0
+ ELSE ROUND(
(
+ SELECT SUM(CAST(REGEXP_SUBSTR(seg2, '^[0-9]+') AS UNSIGNED))
+ FROM JSON_TABLE(
+ CONCAT('["', REPLACE(t.workProcessName, '+', '","'), '"]'),
+ '$[*]' COLUMNS (seg2 VARCHAR(100) PATH '$')
+ ) jt2
+ ) * t.area,
+ 2
+ )
+ END 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,
+ CASE
+ WHEN LOCATE('step', #{laminating}) > 0 THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
+ ELSE MAX(ogd.glass_child)
+ END AS workProcessName,
+ o.batch
FROM
- 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 >= #{selectTime1}
+ 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 >= #{selectTime1}
AND rw.reporting_work_time < #{selectTime2}
- and position(#{selectProcesses} in rw.this_process)
+ <choose>
+ <!-- 鏈変紶宸ュ簭锛氱簿纭尮閰� -->
+ <when test="selectProcesses != null and selectProcesses != ''">
+ AND rw.this_process = #{selectProcesses}
+ </when>
+ <!-- 鏈紶宸ュ簭锛氫笉鍔犻檺鍒� -->
+ <otherwise>
+ </otherwise>
+ </choose>
<if test="teamOutputDTO.thisProcess != null and teamOutputDTO.thisProcess != ''">
- and rw.this_process regexp #{teamOutputDTO.thisProcess}
+ AND rw.this_process REGEXP #{teamOutputDTO.thisProcess}
</if>
<if test="teamOutputDTO.teamsGroupsName != null and teamOutputDTO.teamsGroupsName != ''">
- and rw.teams_groups_name like concat('%', #{teamOutputDTO.teamsGroupsName}, '%')
+ AND rw.teams_groups_name LIKE CONCAT('%', #{teamOutputDTO.teamsGroupsName}, '%')
</if>
<if test="teamOutputDTO.project != null and teamOutputDTO.project != ''">
- and o.project regexp #{teamOutputDTO.project}
+ AND o.project REGEXP #{teamOutputDTO.project}
</if>
<if test="teamOutputDTO.processId != null and teamOutputDTO.processId != ''">
- and rw.process_id regexp #{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}
+ AND od.edging_type REGEXP #{teamOutputDTO.edgingType}
+ </if>
+ <if test="teamOutputDTO.deviceName != null and teamOutputDTO.deviceName != ''">
+ AND rw.device_name REGEXP #{teamOutputDTO.deviceName}
</if>
<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 == ''">
@@ -1919,13 +2100,19 @@
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
+ ) t
+ WHERE 1 = 1
+ <if test="teamOutputDTO.workProcessName != null and teamOutputDTO.workProcessName != ''">
+ AND t.workProcessName REGEXP #{teamOutputDTO.workProcessName}
+ </if>
+ ) x
+ WHERE 1 = 1
+ <if test="teamOutputDTO.thicknessSum != null and 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}
+ </if>
limit #{offset},#{pageSize}
</select>
@@ -2384,29 +2571,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
@@ -2467,49 +2673,97 @@
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>
</select>
<select id="teamOutputFootSum">
SELECT
- SUM(completed_quantity) as completedQuantity,
- ifnull(SUM(ROUND(width * height * completed_quantity / 1000000, 2)),0) AS area
- FROM
+ -- 鏁伴噺鍚堣
+ SUM(x.completed_quantity) AS completedQuantity,
+ -- 闈㈢Н鍚堣
+ IFNULL(SUM(x.area), 0) AS area,
+ -- 鍘氬害脳闈㈢Н鍚堣
+ IFNULL(SUM(x.thicknessArea), 0) AS thicknessArea
+ FROM (
+ /* 绗� 2 灞傦細鍦ㄨ繖閲屾牴鎹� workProcessName 璁＄畻 thicknessSum / thicknessArea */
+ SELECT
+ t.*,
+ /* 鐜荤拑鎬诲帤搴︼細鍙彇姣忔鍓嶉潰鐨勬暟瀛楃浉鍔� */
+ CASE
+ WHEN t.workProcessName IS NULL OR t.workProcessName = '' THEN 0
+ ELSE (
+ SELECT SUM(CAST(REGEXP_SUBSTR(seg, '^[0-9]+') AS UNSIGNED))
+ FROM JSON_TABLE(
+ CAST(CONCAT('["', REPLACE(t.workProcessName, '+', '","'), '"]') AS JSON),
+ '$[*]' COLUMNS (seg VARCHAR(100) PATH '$')
+ ) jt
+ )
+ END AS thicknessSum,
+ /* 鍘氬害 脳 闈㈢Н */
+ CASE
+ WHEN t.workProcessName IS NULL OR t.workProcessName = '' THEN 0
+ ELSE ROUND(
(
+ SELECT SUM(CAST(REGEXP_SUBSTR(seg2, '^[0-9]+') AS UNSIGNED))
+ FROM JSON_TABLE(
+ CAST(CONCAT('["', REPLACE(t.workProcessName, '+', '","'), '"]') AS JSON),
+ '$[*]' COLUMNS (seg2 VARCHAR(100) PATH '$')
+ ) jt2
+ ) * t.area,
+ 2
+ )
+ END AS thicknessArea
+ FROM (
+ /* 绗� 1 灞傦細鍙礋璐ｇ畻濂� workProcessName銆乤rea 绛夊熀纭�瀛楁 */
SELECT
rw.reporting_work_time,
rw.this_process,
@@ -2570,7 +2824,7 @@
AND rw.this_process REGEXP #{teamOutputDTO.thisProcess}
</if>
<if test="teamOutputDTO.teamsGroupsName != null and teamOutputDTO.teamsGroupsName != ''">
- and rw.teams_groups_name like concat('%', #{teamOutputDTO.teamsGroupsName}, '%')
+ AND rw.teams_groups_name LIKE CONCAT('%', #{teamOutputDTO.teamsGroupsName}, '%')
</if>
<if test="teamOutputDTO.project != null and teamOutputDTO.project != ''">
AND o.project REGEXP #{teamOutputDTO.project}
@@ -2586,6 +2840,12 @@
</if>
<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 == ''">
@@ -2614,12 +2874,17 @@
<if test="teamOutputDTO.workProcessName != null and teamOutputDTO.workProcessName != ''">
AND t.workProcessName REGEXP #{teamOutputDTO.workProcessName}
</if>
- ORDER BY
- t.this_process,
- t.process_id,
- t.order_number,
- t.reporting_work_time,
- t.teams_groups_name
+ ) x
+ WHERE 1 = 1
+ <if test="teamOutputDTO.thicknessSum != null and 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}
+ </if>
+ ;
+
+
</select>
<select id="getLaminating">
@@ -2711,47 +2976,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'">
--
Gitblit v1.8.0