From c18fecddd8c9a165c6a1026c5573f864e1713718 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 06 八月 2025 16:56:29 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 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..e6b0814 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,10 @@
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,
+ if(dd.responsible_process=rw.this_process,2,dd.quality_ins_status) as qualityInsStatus,
+ if(dd.quality_ins_status=1,1,2) as orderBy
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
@@ -309,7 +319,7 @@
left join (select * from sd.order_glass_detail group by order_id,order_number,technology_number) as ogd
on rw.order_id = ogd.order_id and dd.order_number = ogd.order_number and rwd.technology_number=ogd.technology_number
- <where> dd.breakage_quantity-dd.quantity>0 and dd.available=0 and (dd.responsible_process=rw.this_process or (dd.quality_ins_status!=1)) and rw.reviewed_state!=-1
+ <where> dd.breakage_quantity-dd.quantity>0 and dd.available=0 and rw.reviewed_state!=-1 /*(dd.responsible_process=rw.this_process or (dd.quality_ins_status!=1)) and */
and o.create_order>0 and dd.patch_status=0
<if test="patchLogAddDTO.orderId != null and patchLogAddDTO.orderId != ''">
and o.order_id regexp #{patchLogAddDTO.orderId}
@@ -353,6 +363,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>
@@ -372,7 +385,7 @@
and dd.breakage_reason regexp #{patchLogAddDTO.patchReason}
</if>
</where>
- order by dd.id desc
+ order by orderBy desc,dd.id desc
</select>
<delete id="deleteReplenishMp">
--
Gitblit v1.8.0