From 37175875537a92930a19688ad1cc2c49fb415f0f Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期五, 01 八月 2025 14:41:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml b/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
index 522421e..ee659ad 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
@@ -24,6 +24,7 @@
od.product_name,
r.technology_number,
ogd.glass_address,
+ ogd.glass_child,
r.patch_num,
od.width,
od.height,
@@ -94,6 +95,9 @@
</if>
<if test="patchLog.glassAddress != null and patchLog.glassAddress != ''">
and ogd.glass_address regexp #{patchLog.glassAddress}
+ </if>
+ <if test="patchLog.glassChild != null and patchLog.glassChild != ''">
+ and ogd.glass_child regexp #{patchLog.glassChild}
</if>
<if test="patchLog.responsibleTeam != null and patchLog.responsibleTeam != ''">
and r.responsible_team regexp #{patchLog.responsibleTeam}
@@ -184,6 +188,9 @@
</if>
<if test="patchLog.glassAddress != null and patchLog.glassAddress != ''">
and ogd.glass_address regexp #{patchLog.glassAddress}
+ </if>
+ <if test="patchLog.glassChild != null and patchLog.glassChild != ''">
+ and ogd.glass_child regexp #{patchLog.glassChild}
</if>
<if test="patchLog.responsibleTeam != null and patchLog.responsibleTeam != ''">
and r.responsible_team regexp #{patchLog.responsibleTeam}
@@ -299,7 +306,8 @@
dd.responsible_equipment as responsibleEquipment,
dd.responsible_team as responsibleTeam,
ROUND((dd.breakage_quantity-dd.quantity) * od.width * od.height / 1000000, 2) as patchArea,
- rw.quality_inspector as qualityInspector
+ rw.quality_inspector as qualityInspector,
+ ogd.glass_child as glassChild
from pp.damage_details dd
left join pp.reporting_work_detail rwd on dd.reporting_work_id = rwd.reporting_work_id and dd.order_number=rwd.order_number and dd.technology_number=rwd.technology_number
left join pp.reporting_work rw on dd.reporting_work_id = rw.reporting_work_id
@@ -353,6 +361,9 @@
<if test="patchLogAddDTO.glassAddress != null and patchLogAddDTO.glassAddress != ''">
and ogd.glass_address regexp #{patchLogAddDTO.glassAddress}
</if>
+ <if test="patchLogAddDTO.glassChild != null and patchLogAddDTO.glassChild != ''">
+ and ogd.glass_child regexp #{patchLogAddDTO.glassChild}
+ </if>
<if test="patchLogAddDTO.responsibleTeam != null and patchLogAddDTO.responsibleTeam != ''">
and dd.responsible_team regexp #{patchLogAddDTO.responsibleTeam}
</if>
--
Gitblit v1.8.0