From 72671bbfdac9fcdbdcd7c67265fce4539a7ec365 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 05 七月 2024 18:19:51 +0800
Subject: [PATCH] 修改流程卡界面编号显示错误问题，将流程卡合并打印工艺流程显示合并产品相关，修改打印排序弹出打开方式
---
north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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 b440d69..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,
@@ -46,7 +46,7 @@
<where>
date(r.create_time)>=#{startDate} and date(r.create_time) <= #{endDate}
</where>
- order by r.review_status
+ order by r.review_status,r.id desc
limit #{offset},#{pageSize};
</select>
@@ -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}
@@ -128,7 +129,8 @@
od.width,
od.height,
od.shape,
- dd.responsible_process as patchProcesses,
+ dd.responsible_process as responsibleProcess,
+ rw.this_process as patchProcesses,
dd.breakage_quantity-dd.quantity as breakageQuantity,
dd.return_process as patchProcesses,
dd.breakage_reason as patchReason,
@@ -137,7 +139,7 @@
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.qualityIns_pector as qualityInsPector
+ 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
@@ -147,8 +149,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=0 and (dd.responsible_process=rw.this_process or (dd.responsible_process!=rw.this_process and dd.qualityIns_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