From e00b54ec7322cf7cba5883e17f2e2843f71b8833 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 20 十一月 2025 17:05:54 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 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 e6b0814..1f09882 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
@@ -26,8 +26,8 @@
ogd.glass_address,
ogd.glass_child,
r.patch_num,
- od.width,
- od.height,
+ ogd.child_width as width,
+ ogd.child_height as height,
od.shape,
r.patch_type,
r.patch_reason,
@@ -82,10 +82,10 @@
and r.quality_inspector regexp #{patchLog.qualityInspector}
</if>
<if test="patchLog.width != null and patchLog.width != ''">
- and od.width regexp #{patchLog.width}
+ and ogd.child_width regexp REGEXP_REPLACE(#{patchLog.width},'\\.0+$','')
</if>
<if test="patchLog.height != null and patchLog.height != ''">
- and od.height regexp #{patchLog.height}
+ and ogd.child_height regexp REGEXP_REPLACE(#{patchLog.height},'\\.0+$','')
</if>
<if test="patchLog.shape != null and patchLog.shape != ''">
and od.shape regexp #{patchLog.shape}
@@ -175,10 +175,10 @@
and r.quality_inspector regexp #{patchLog.qualityInspector}
</if>
<if test="patchLog.width != null and patchLog.width != ''">
- and od.width regexp #{patchLog.width}
+ and ogd.child_width regexp REGEXP_REPLACE(#{patchLog.width},'\\.0+$','')
</if>
<if test="patchLog.height != null and patchLog.height != ''">
- and od.height regexp #{patchLog.height}
+ and ogd.child_height regexp REGEXP_REPLACE(#{patchLog.height},'\\.0+$','')
</if>
<if test="patchLog.shape != null and patchLog.shape != ''">
and od.shape regexp #{patchLog.shape}
@@ -293,8 +293,8 @@
dd.technology_number as technologyNumber,
ogd.glass_address as glassAddress,
dd.breakage_quantity-dd.quantity as patchNum,
- od.width,
- od.height,
+ ogd.child_width as width,
+ ogd.child_height as height,
od.shape,
dd.responsible_process as responsibleProcess,
rw.this_process as patchProcesses,
@@ -309,7 +309,8 @@
rw.quality_inspector as qualityInspector,
ogd.glass_child as glassChild,
if(dd.responsible_process=rw.this_process,2,dd.quality_ins_status) as qualityInsStatus,
- if(dd.quality_ins_status=1,1,2) as orderBy
+ if(dd.quality_ins_status=1,1,2) as orderBy,
+ dd.responsible_personnel as responsiblePersonnel
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
@@ -352,10 +353,10 @@
and rw.quality_inspector regexp #{patchLogAddDTO.qualityInspector}
</if>
<if test="patchLogAddDTO.width != null and patchLogAddDTO.width != ''">
- and od.width regexp #{patchLogAddDTO.width}
+ and ogd.child_width regexp REGEXP_REPLACE(#{patchLogAddDTO.width},'\\.0+$','')
</if>
<if test="patchLogAddDTO.height != null and patchLogAddDTO.height != ''">
- and od.height regexp #{patchLogAddDTO.height}
+ and ogd.child_height regexp REGEXP_REPLACE(#{patchLogAddDTO.height},'\\.0+$','')
</if>
<if test="patchLogAddDTO.shape != null and patchLogAddDTO.shape != ''">
and od.shape regexp #{patchLogAddDTO.shape}
--
Gitblit v1.8.0