From 42f7c874cc8b5d4a5f0d2b9b71cc120f81e9e80a Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 15 七月 2024 12:13:41 +0800
Subject: [PATCH] 添加补片打印，修改流程卡打印为可勾选订单编辑
---
north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml | 7 ++++---
1 files changed, 4 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 7c1cd65..1fb8366 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" >
+ <select id="SelectReplenish" >
select
r.id,
r.review_status,
@@ -22,7 +22,7 @@
o.batch,
od.building_number,
od.product_name,
- ogd.technology_number,
+ r.technology_number,
ogd.glass_address,
r.patch_num,
od.width,
@@ -88,6 +88,7 @@
update pp.patch_log set reviewer=#{userName},review_status=1,update_time=now() where id=#{patchLog.id}
</update>
+
<update id="updateOrderProcessDetail" >
update sd.order_process_detail
set reporting_work_num=reporting_work_num - #{patchLog.patchNum}
@@ -148,7 +149,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