From 9ccc8bd3a53160a40cf60f14e5867f6ce9f6c58f Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 26 十二月 2025 16:49:15 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml b/north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml
index 52672c9..996eb69 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml
@@ -51,7 +51,7 @@
and r.rework_id regexp #{rework.reworkId}
</if>
<if test="rework.reworkTeam != null and rework.reworkTeam != ''">
- and r.rework_team regexp #{rework.reworkTeam}
+ and r.rework_team like concat('%', #{rework.reworkTeam}, '%')
</if>
<if test="rework.orderId != null and rework.orderId != ''">
and r.order_id regexp #{rework.orderId}
@@ -99,7 +99,7 @@
and ogd.glass_address regexp #{rework.glassAddress}
</if>
<if test="rework.responsibleTeam != null and rework.responsibleTeam != ''">
- and r.responsible_team regexp #{rework.responsibleTeam}
+ and r.responsible_team like concat('%', #{rework.responsibleTeam}, '%')
</if>
<if test="rework.responsibleEquipment != null and rework.responsibleEquipment != ''">
and r.responsible_equipment regexp #{rework.responsibleEquipment}
@@ -123,7 +123,7 @@
and r.rework_processes regexp #{rework.reworkProcesses}
</if>
<if test="rework.reviewer != null and rework.reviewer != ''">
- and r.reviewer regexp #{rework.reviewer}
+ and r.reviewer like concat('%', #{rework.reviewer}, '%')
</if>
</where>
order by r.review_status,r.id desc limit #{offset},#{pageSize};
@@ -145,7 +145,7 @@
and r.rework_id regexp #{rework.reworkId}
</if>
<if test="rework.reworkTeam != null and rework.reworkTeam != ''">
- and r.rework_team regexp #{rework.reworkTeam}
+ and r.rework_team like concat('%', #{rework.reworkTeam}, '%')
</if>
<if test="rework.orderId != null and rework.orderId != ''">
and r.order_id regexp #{rework.orderId}
@@ -193,7 +193,7 @@
and ogd.glass_address regexp #{rework.glassAddress}
</if>
<if test="rework.responsibleTeam != null and rework.responsibleTeam != ''">
- and r.responsible_team regexp #{rework.responsibleTeam}
+ and r.responsible_team like concat('%', #{rework.responsibleTeam}, '%')
</if>
<if test="rework.responsibleEquipment != null and rework.responsibleEquipment != ''">
and r.responsible_equipment regexp #{rework.responsibleEquipment}
@@ -217,11 +217,10 @@
and r.rework_processes regexp #{rework.reworkProcesses}
</if>
<if test="rework.reviewer != null and rework.reviewer != ''">
- and r.reviewer regexp #{rework.reviewer}
+ and r.reviewer like concat('%', #{rework.reviewer}, '%')
</if>
</where>
- ) as zu
- limit #{offset},#{pageSize};
+ ) as zu;
</select>
<select id="getSelectRework">
@@ -258,7 +257,8 @@
left join (select * from sd.order_glass_detail group by order_id,order_number) as ogd
on rw.order_id = ogd.order_id and dd.order_number = ogd.order_number
- where dd.breakage_quantity-dd.quantity>0 and dd.available=1 and o.create_order>0 order by dd.id desc
+ where dd.breakage_quantity-dd.quantity>0 and dd.available=1 and o.create_order>0 and rw.reviewed_state>=0
+ order by dd.id desc
</select>
@@ -296,6 +296,7 @@
<update id="updateReworkDdMp">
update pp.damage_details set patch_status=0,quantity=quantity-#{reworkNum}
where reporting_work_id=#{reportingWorkId} and order_number=#{orderSort} and technology_number=#{technologyNumber}
+ and breakage_type=#{reworkType} and breakage_reason=#{reworkReason}
</update>
<update id="updateReworkBgMp">
--
Gitblit v1.8.0