From 0a68c5b8442e3da4325ec5ad4e42db64d42057f8 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 24 四月 2024 13:11:06 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

---
 north-glass-erp/target/classes/mapper/pp/ReworkMapper.xml |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/north-glass-erp/target/classes/mapper/pp/ReworkMapper.xml b/north-glass-erp/target/classes/mapper/pp/ReworkMapper.xml
index c0921dc..f0ca31e 100644
--- a/north-glass-erp/target/classes/mapper/pp/ReworkMapper.xml
+++ b/north-glass-erp/target/classes/mapper/pp/ReworkMapper.xml
@@ -45,8 +45,7 @@
         <where>
             date(r.create_time)>=#{startDate} and date(r.create_time) &lt;= #{endDate}
         </where>
-         order by r.review_status
-        limit #{offset},#{pageSize};
+         order by r.review_status,r.id desc limit #{offset},#{pageSize};
     </select>
 
     <select id="SelectReworkPageTotal" >
@@ -88,18 +87,17 @@
                dd.responsible_equipment as responsibleEquipment,
                dd.responsible_team as responsibleTeam,
                ROUND((dd.breakage_quantity-dd.quantity) * od.width * od.height / 1000000, 2) as reworkArea,
-               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
+                 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
-
+        where  dd.breakage_quantity-dd.quantity>0 and dd.available=1 order by dd.id desc
     </select>
 
 
@@ -118,12 +116,12 @@
         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>
 
     <update id="updateRework"  >
-        update pp.rework set reviewer=#{userName},review_status=1,update_time=now() where rework_id=#{rework.id}
+        update pp.rework set reviewer=#{userName},review_status=1,update_time=now() where id=#{rework.id}
     </update>
 
     <update id="updateDamageDetails"  >

--
Gitblit v1.8.0