From 01d8334aaf05ff0ac0e4c0de3e43b4ee6d6fa73b Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 09 八月 2024 10:39:52 +0800
Subject: [PATCH] 修改流程卡打印查询，补片流程卡同步流程卡的修改
---
north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml | 12 +++++++++---
1 files changed, 9 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 0f9955d..efa8dcc 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
@@ -9,7 +9,7 @@
<!--鑾峰彇琛ョ墖鏁版嵁-->
- <select id="SelectReplenish" resultType="Item" >
+ <select id="SelectReplenish" >
select
r.id,
r.review_status,
@@ -38,7 +38,8 @@
r.patch_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
from pp.patch_log 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
@@ -110,6 +111,11 @@
update pp.damage_details set quantity=quantity+#{patchLog.patchNum},patch_status=1 where id=#{patchLog.reviewer}
</update>
+ <update id="updateReportingWorkDetail" >
+ update pp.reporting_work_detail set patch_status=1 where reporting_work_id=#{reportingWorkId}
+ and order_number=#{orderSort} and technology_number=#{technologyNumber}
+ </update>
+
<select id="getSelectReplenish">
select date(rw.reporting_work_time) as reportingWorkTime,
@@ -149,7 +155,7 @@
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=0 and (dd.responsible_process=rw.this_process or (dd.quality_ins_status!=1))
+ 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
order by dd.id desc
</select>
--
Gitblit v1.8.0