From a3dfc8966bb702c4ccb20f2a2afda7b7c39bd98d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 06 十一月 2024 15:17:08 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml |   26 +++++++++++++++-----------
 1 files changed, 15 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..5b496f1 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
@@ -27,6 +27,7 @@
                             arch_rise,
                             weight,
                             perimeter,
+                            monolithic_perimeter,
                             other_columns
                           )
         values
@@ -53,6 +54,7 @@
             #{orderDetail.archRise},
             #{orderDetail.weight},
             #{orderDetail.perimeter},
+            #{orderDetail.monolithicPerimeter},
             #{orderDetail.otherColumns}
              )
         </foreach>
@@ -63,7 +65,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 +120,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 +190,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 +258,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 +278,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 +421,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 +552,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 +565,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 +612,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 +762,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 +945,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 +978,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