From acaf8ca38cd32bc474bb46b593db2a8d75b9bfdd Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期六, 12 十月 2024 08:26:23 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 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..b6d8398 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
@@ -63,7 +63,8 @@
             update order_detail as a
             set
                 a.price = #{item.price},
-                a.gross_amount = #{item.grossAmount}
+                a.gross_amount = #{item.grossAmount},
+                a.other_columns = #{item.otherColumns}
             where
                 a.order_id = #{item.orderId} and
                 a.order_number =  #{item.orderNumber}
@@ -117,7 +118,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 +188,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 +256,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 +276,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 +419,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 +550,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 +563,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 +610,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 +760,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 +943,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 +976,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