From 7aac0b821663de152ef665a030ebbef1d34b41f2 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 16 四月 2025 11:31:20 +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 |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 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 b6d8398..3972ee5 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>
@@ -95,6 +97,7 @@
         <result column="levelTwo" property="levelTwo"/>
         <result column="total_thickness" property="totalThickness"/>
         <result column="createTime" property="createTime"/>
+        <result column="weights" property="weight"/>
 
         <result column="order_type" property="order.orderType"/>
         <result column="customer_name" property="order.customerName"/>
@@ -256,7 +259,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]} and b.create_order>0
+        where  date(b.create_time)>=#{dates[0]} and date(b.create_time) &lt;= #{dates[1]} and b.order_review>0
         order by b.id desc
     </select>
 
@@ -264,10 +267,11 @@
     <select id="getOrderReport" resultMap="orderMap">
         SELECT
             *,
+            round(a.weight*a.quantity,2) as weights,
             a.create_time as createTime,
             d.type_name as levelOne,
             e.type_name as levelTwo
-        from order_detail as a
+        from sd.order_detail as a
         left join sd.`order` as b
             on b.order_id = a.order_id
         left join sd.product as c
@@ -550,11 +554,12 @@
     <select id="exportOrderReport"  >
         SELECT
             *,
+            round(a.weight*a.quantity,2) as weights,
             b.processing_note as processingNotes,
             a.create_time as createTime,
             d.type_name as level_one,
             e.type_name as level_two
-        from order_detail as a
+        from sd.order_detail as a
          left join sd.`order` as b
                    on b.order_id = a.order_id
          left join sd.product as c
@@ -563,7 +568,8 @@
                    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]} and b.create_order>0
+        where  date(a.create_time)>=#{dates[0]} and date(a.create_time) &lt;= #{dates[1]} and b.order_review>0
+        order by b.order_id desc
     </select>
 
 
@@ -585,6 +591,7 @@
         a.edging_type,
         b.pack_type,
         round(sum(a.perimeter),2) as perimeter,
+        round(sum(a.weight*a.quantity),2) as weights,
         a.price,
         sum(a.gross_amount ) as gross_amount,
         b.al_type,
@@ -913,7 +920,7 @@
                a.remarks,
                a.bend_radius,
                a.edging_type,
-               a.weight,
+               round(sum(a.weight*a.quantity),2) as weights,
                a.perimeter,
                a.other_columns,
                a.warehouse_num,
@@ -976,7 +983,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 b.create_order>0
+          and date(b.create_time) &lt;= #{dates[1]} and b.order_review>0
         group by b.order_id, a.product_id
         order by b.order_id desc
     </select>
@@ -1003,8 +1010,9 @@
 
             (a.product_id) as 'productId',
                     a.product_name as 'productName',
+                    p.remarks as 'remarks',
                     a.order_number as 'orderNumber'
-        from order_detail as a
+        from order_detail as a left join sd.product p on a.product_id=p.id
         where a.order_id = #{orderId}
         group by a.product_id
     </select>
@@ -1014,8 +1022,9 @@
 
         (a.product_id) as 'productId',
         a.product_name as 'productName',
+        p.remarks as 'remarks',
         a.order_number as 'orderNumber'
-        from order_detail as a
+        from sd.order_detail as a left join sd.product p on a.product_id=p.id
         where a.order_id = #{orderId} and a.product_id IN
         <foreach item="item" index="index" collection="productId" open="(" separator="," close=")">
             #{item}

--
Gitblit v1.8.0