From 76bf2824bf55e8f4c3ccbc14b3b2719bf8fb219f Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 03 九月 2024 10:10:47 +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 | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 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 ab2fd15..488e0dd 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml
@@ -37,13 +37,16 @@
r.rework_processes,
r.reviewer,
date(r.create_time) as create_time,
- date(r.update_time) as update_time
+ date(r.update_time) as update_time,
+ JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS glassNumber,
+ r.reporting_work_id
from pp.rework r left join sd.order_detail od on r.order_id=od.order_id and r.order_sort=od.order_number
left join sd.`order` o on r.order_id = o.order_id
left join (select * from sd.order_glass_detail group by order_id,order_number) as ogd
on r.order_id = ogd.order_id and r.order_sort = ogd.order_number
<where>
date(r.create_time)>=#{startDate} and date(r.create_time) <= #{endDate}
+ and o.create_order>0
</where>
order by r.review_status,r.id desc limit #{offset},#{pageSize};
</select>
@@ -59,6 +62,7 @@
on r.order_id = ogd.order_id and r.order_sort = ogd.order_number
<where>
date(r.create_time)>=#{startDate} and date(r.create_time) <= #{endDate}
+ and o.create_order>0
</where>
) as zu
limit #{offset},#{pageSize};
@@ -89,15 +93,16 @@
ROUND((dd.breakage_quantity-dd.quantity) * od.width * od.height / 1000000, 2) as reworkArea,
rw.quality_inspector as qualityInspector
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 and rw.reviewed_state>0
+ 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 and rwd.review_status>0
+ left join pp.reporting_work rw on dd.reporting_work_id = rw.reporting_work_id
left join sd.`order` o on rw.order_id = o.order_id
left join sd.order_detail od on rw.order_id = od.order_id and dd.order_number = od.order_number
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 order by dd.id desc
+ where dd.breakage_quantity-dd.quantity>0 and dd.available=1 and o.create_order>0 order by dd.id desc
</select>
@@ -128,7 +133,19 @@
update pp.damage_details set quantity=quantity+#{rework.reworkNum} where id=#{rework.reviewer}
</update>
+ <delete id="deleteReworkMp">
+ delete from pp.rework where rework_id=#{patchId}
+ </delete>
+ <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}
+ </update>
+
+ <update id="updateReworkBgMp">
+ update pp.reporting_work_detail set patch_status=0
+ where reporting_work_id=#{reportingWorkId} and order_number=#{orderSort} and technology_number=#{technologyNumber}
+ </update>
--
Gitblit v1.8.0