From b5a9dccccaf5bed064891a05ec8ff3f21de9cff0 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 25 九月 2024 16:31:14 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
index f3c61ee..a9d87fb 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
@@ -117,7 +117,7 @@
         SELECT
         *
         from  sd.`order` as b
-        where  date(b.create_time)>=#{startDate} and date(b.create_time) &lt;= #{endDate}
+        where  date(b.create_time)>=#{startDate} and date(b.create_time) &lt;= #{endDate} and b.create_order>0
         <if test="order.orderType != null and order.orderType != ''">
             and b.order_type like concat('%',#{order.orderType},'%')
         </if>
@@ -187,7 +187,7 @@
         CEILING(count(b.id)/#{pageSize}) as 'pageTotal',
         count(b.id) as 'total'
         from  sd.`order` as b
-        where  date(b.create_time)>=#{startDate} and date(b.create_time) &lt;= #{endDate}
+        where  date(b.create_time)>=#{startDate} and date(b.create_time) &lt;= #{endDate} and b.create_order>0
         <if test="order.orderType != null and order.orderType != ''">
             and b.order_type like concat('%',#{order.orderType},'%')
         </if>
@@ -255,7 +255,7 @@
     <select id="exportOrderSummary"  >
         SELECT *
         from sd.`order` as b
-        where  date(b.create_time)>=#{dates[0]} and date(b.create_time) &lt;= #{dates[1]}
+        where  date(b.create_time)>=#{dates[0]} and date(b.create_time) &lt;= #{dates[1]} and b.create_order>0
         order by b.id desc
     </select>
 
@@ -275,7 +275,7 @@
             on d.type_id = c.type_id
         left join sd.basic_glass_type as e
             on e.type_id = d.belong
-        where  date(b.create_time)>=#{startDate} and date(b.create_time) &lt;= #{endDate}
+        where  date(b.create_time)>=#{startDate} and date(b.create_time) &lt;= #{endDate} and b.create_order>0
 
         <if test="orderDetail.order!=null and (orderDetail.order.orderType != null and orderDetail.order.orderType != '')">
             and b.order_type like concat('%',#{orderDetail.order.orderType},'%')
@@ -418,7 +418,7 @@
                            on d.type_id = c.type_id
                  left join sd.basic_glass_type as e
                            on e.type_id = d.belong
-        where  date(b.create_time)>=#{startDate} and date(b.create_time) &lt;= #{endDate}
+        where  date(b.create_time)>=#{startDate} and date(b.create_time) &lt;= #{endDate} and b.create_order>0
         <if test="orderDetail.order!=null and (orderDetail.order.orderType != null and orderDetail.order.orderType != '')">
             and b.order_type like concat('%',#{orderDetail.order.orderType},'%')
         </if>
@@ -549,6 +549,7 @@
     <select id="exportOrderReport"  >
         SELECT
             *,
+            b.processing_note as processingNotes,
             a.create_time as createTime,
             d.type_name as level_one,
             e.type_name as level_two
@@ -561,7 +562,7 @@
                    on d.type_id = c.type_id
          left join sd.basic_glass_type as e
                    on e.type_id = d.belong
-        where  date(a.create_time)>=#{dates[0]} and date(a.create_time) &lt;= #{dates[1]}
+        where  date(a.create_time)>=#{dates[0]} and date(a.create_time) &lt;= #{dates[1]} and b.create_order>0
     </select>
 
 
@@ -608,7 +609,7 @@
         on d.type_id = c.type_id
         left join sd.basic_glass_type as e
         on e.type_id = d.belong
-        where  date(b.create_time)>=#{startDate} and date(b.create_time) &lt;= #{endDate}
+        where  date(b.create_time)>=#{startDate} and date(b.create_time) &lt;= #{endDate} and b.create_order>0
 
         <if test="orderDetail.order!=null and (orderDetail.order.orderType != null and orderDetail.order.orderType != '')">
             and b.order_type like concat('%',#{orderDetail.order.orderType},'%')
@@ -758,7 +759,7 @@
         on d.type_id = c.type_id
         left join sd.basic_glass_type as e
         on e.type_id = d.belong
-        where date(b.create_time)>=#{startDate} and date(b.create_time) &lt;= #{endDate}
+        where date(b.create_time)>=#{startDate} and date(b.create_time) &lt;= #{endDate} and b.create_order>0
         <if test="orderDetail.order!=null and (orderDetail.order.orderType != null and orderDetail.order.orderType != '')">
             and b.order_type like concat('%',#{orderDetail.order.orderType},'%')
         </if>
@@ -941,7 +942,7 @@
                b.delivery_address,
                b.other_money,
                b.other_money_remarks,
-               b.processing_note,
+               b.processing_note as processingNotes,
                b.other_remarks,
                b.area,
                b.quantity,
@@ -974,7 +975,7 @@
                  left join sd.basic_glass_type as e
                            on e.type_id = d.belong
         where date(b.create_time) >= #{dates[0]}
-          and date(b.create_time) &lt;= #{dates[1]}
+          and date(b.create_time) &lt;= #{dates[1]} and b.create_order>0
         group by b.order_id, a.product_id
         order by b.order_id desc
     </select>

--
Gitblit v1.8.0