From f94dec7ddbd0aa96f642f04d41d0f74ca0edfdc7 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 25 六月 2024 18:22:30 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml |   72 ++++++++++++++++++++++++++++++++++--
 1 files changed, 68 insertions(+), 4 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 2cf1634..e9bfbc6 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
@@ -24,6 +24,7 @@
                             remarks,
                             bend_radius,
                             edging_type,
+                            arch_rise,
                             weight,
                             perimeter,
                             other_columns
@@ -49,6 +50,7 @@
             #{orderDetail.remarks},
             #{orderDetail.bendRadius},
             #{orderDetail.edgingType},
+            #{orderDetail.archRise},
             #{orderDetail.weight},
             #{orderDetail.perimeter},
             #{orderDetail.otherColumns}
@@ -392,12 +394,12 @@
         </if>
     </select>
 
-    <select id="exportOrderReport">
+    <select id="exportOrderReport"  >
         SELECT
             *,
             a.create_time as createTime,
-            d.type_name as levelOne,
-            e.type_name as levelTwo
+            d.type_name as level_one,
+            e.type_name as level_two
         from order_detail as a
          left join sd.`order` as b
                    on b.order_id = a.order_id
@@ -407,7 +409,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]}
     </select>
 
 
@@ -725,4 +727,66 @@
         ) as ss
     </select>
 
+    <select id="exportOrderProductSummary"  >
+        SELECT
+            *,
+            a.create_time as createTime,
+            d.type_name as level_one,
+            e.type_name as level_two
+        from order_detail as a
+                 left join sd.`order` as b
+                           on b.order_id = a.order_id
+                 left join sd.product as c
+                           on c.id = a.product_id
+                 left join sd.basic_glass_type as d
+                           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]}
+        group by b.order_id,a.product_id
+        order by b.order_id desc
+    </select>
+    
+    <select id="getOrderProductDetailTag">
+        select c.customer_name,c.order_id,b.remarks,c.project,
+               if(a.child_width &lt; a.child_height,a.child_width,a.child_height ),
+               if(a.child_width &lt; a.child_height,a.child_height,a.child_width ),
+               sum(b.quantity),
+               a.glass_child,
+               b.processing_note
+        from order_glass_detail as a
+        left join order_detail as b
+        on a.order_id = b.order_id
+        and a.order_number = b.order_number
+        left join `order` as c
+        on c.order_id = a.order_id
+        where a.order_id = #{orderId}
+        group by a.glass_child,a.child_width,a.child_height
+    </select>
+
+    <select id="getOrderProductDistinctById">
+        select
+
+            (a.product_id) as 'productId',
+                    a.product_name as 'productName',
+                    a.order_number as 'orderNumber'
+        from order_detail as a
+        where a.order_id = #{orderId}
+        group by a.product_id
+    </select>
+
+    <select id="getOrderProductByProductId">
+        select
+            *
+        from order_detail as a
+        where a.order_id = #{orderId}
+        and a.product_id = #{productId}
+        order by id;
+    </select>
+
+
+
+
+
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0