From edfac6431feca1b98ffcc3085c3f0b8c232396c3 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 10 九月 2024 12:43:08 +0800
Subject: [PATCH] 工单新增显示加工要求

---
 north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 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 3d45806..488e0dd 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml
@@ -37,13 +37,16 @@
         r.rework_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,
+        r.reporting_work_id
         from pp.rework 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
         on r.order_id = ogd.order_id and r.order_sort = ogd.order_number
         <where>
             date(r.create_time)>=#{startDate} and date(r.create_time) &lt;= #{endDate}
+            and o.create_order>0
         </where>
          order by r.review_status,r.id desc limit #{offset},#{pageSize};
     </select>
@@ -59,6 +62,7 @@
                                  on r.order_id = ogd.order_id and r.order_sort = ogd.order_number
         <where>
             date(r.create_time)>=#{startDate} and date(r.create_time) &lt;= #{endDate}
+            and o.create_order>0
         </where>
               ) as zu
         limit #{offset},#{pageSize};
@@ -98,7 +102,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=1 order by dd.id desc
+        where  dd.breakage_quantity-dd.quantity>0 and dd.available=1 and o.create_order>0 order by dd.id desc
     </select>
 
 
@@ -129,7 +133,19 @@
         update pp.damage_details set quantity=quantity+#{rework.reworkNum} where id=#{rework.reviewer}
     </update>
 
+    <delete id="deleteReworkMp">
+        delete from pp.rework where rework_id=#{patchId}
+    </delete>
 
+    <update id="updateReworkDdMp">
+        update pp.damage_details set patch_status=0,quantity=quantity-#{reworkNum}
+        where reporting_work_id=#{reportingWorkId} and order_number=#{orderSort} and technology_number=#{technologyNumber}
+    </update>
+
+    <update id="updateReworkBgMp">
+        update pp.reporting_work_detail set patch_status=0
+        where reporting_work_id=#{reportingWorkId} and order_number=#{orderSort} and technology_number=#{technologyNumber}
+    </update>
 
 
 

--
Gitblit v1.8.0