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/ReworkMapper.xml |   12 +++++-------
 1 files changed, 5 insertions(+), 7 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 d6d0a29..ab2fd15 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml
@@ -21,7 +21,7 @@
         o.project,
         o.batch,
         od.product_name,
-        ogd.technology_number,
+        r.technology_number,
         ogd.glass_address,
         r.rework_num,
         od.width,
@@ -45,8 +45,7 @@
         <where>
             date(r.create_time)>=#{startDate} and date(r.create_time) &lt;= #{endDate}
         </where>
-         order by r.review_status,r.id desc
-        limit #{offset},#{pageSize};
+         order by r.review_status,r.id desc limit #{offset},#{pageSize};
     </select>
 
     <select id="SelectReworkPageTotal" >
@@ -91,15 +90,14 @@
                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
+                 left join pp.reporting_work rw on dd.reporting_work_id = rw.reporting_work_id and rw.reviewed_state>0
 
                  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 and dd.qualityIns_status=1 order by dd.id
-
+        where  dd.breakage_quantity-dd.quantity>0 and dd.available=1 order by dd.id desc
     </select>
 
 
@@ -118,7 +116,7 @@
         values (
                    #{oddNumber}, #{rework.reportingWorkId},#{rework.processId},#{rework.orderId},#{rework.orderSort},#{rework.technologyNumber},#{rework.responsibleTeam},
                 #{rework.responsiblePersonnel},#{rework.reworkType},#{rework.reworkReason},#{rework.reworkProcesses},#{rework.reworkNum},
-                #{rework.reworkArea},#{rework.reworkTeam},#{rework.responsibleEquipment},#{rework.qualityInspector},"",0,now()
+                #{rework.reworkArea},#{rework.reworkTeam},#{rework.responsibleEquipment},#{rework.qualityInspector},'',0,now()
                )
     </insert>
 

--
Gitblit v1.8.0