From 8d0850541f66e843849e2118d0c8057e4d080ba1 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 05 九月 2024 09:18:29 +0800
Subject: [PATCH] 设置菜单语言从语言文件中获取

---
 north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml |    4 +++-
 1 files changed, 3 insertions(+), 1 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 aac51e1..488e0dd 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml
@@ -46,6 +46,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>
          order by r.review_status,r.id desc limit #{offset},#{pageSize};
     </select>
@@ -61,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};
@@ -100,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>
 
 

--
Gitblit v1.8.0