From 1ae5f2198b70aba54c49f1752e02dfe7b9d5a2e9 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期日, 04 八月 2024 17:35: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 |   26 +++++++++++++++++---------
 1 files changed, 17 insertions(+), 9 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 cf905a9..4d97416 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
@@ -108,6 +108,7 @@
         <result column="creator" property="order.creator"/>
         <result column="verifier" property="order.verifier"/>
         <result column="customer_batch" property="order.customerBatch"/>
+        <result column="other_money" property="order.otherMoney"/>
 
     </resultMap>
 
@@ -136,7 +137,7 @@
         <if test="orderDetail.order!=null and  orderDetail.order.customerId != null and orderDetail.order.customerId != ''">
             and b.customer_id like concat('%',#{orderDetail.order.customerId},'%')
         </if>
-        <if test="orderDetail.order!=null and  orderDetail.order.customerId != null and orderDetail.order.customerName != ''">
+        <if test="orderDetail.order!=null and  orderDetail.order.customerName != null and orderDetail.order.customerName != ''">
             and b.customer_name like concat('%',#{orderDetail.order.customerName},'%')
         </if>
         <if test="orderDetail.order!=null and  orderDetail.order.project != null and orderDetail.order.project != ''">
@@ -278,7 +279,7 @@
         <if test="orderDetail.order!=null and  orderDetail.order.customerId != null and orderDetail.order.customerId != ''">
             and b.customer_id like concat('%',#{orderDetail.order.customerId},'%')
         </if>
-        <if test="orderDetail.order!=null and  orderDetail.order.customerId != null and orderDetail.order.customerName != ''">
+        <if test="orderDetail.order!=null and  orderDetail.order.customerName != null and orderDetail.order.customerName != ''">
             and b.customer_name like concat('%',#{orderDetail.order.customerName},'%')
         </if>
         <if test="orderDetail.order!=null and  orderDetail.order.project != null and orderDetail.order.project != ''">
@@ -428,6 +429,7 @@
         b.batch,
         a.product_id,
         a.product_name,
+        b.other_money,
         sum(a.quantity) as quantity,
         sum(a.gross_area) as gross_area,
         sum(a.compute_gross_area) as compute_gross_area,
@@ -468,7 +470,7 @@
         <if test="orderDetail.order!=null and  orderDetail.order.customerId != null and orderDetail.order.customerId != ''">
             and b.customer_id like concat('%',#{orderDetail.order.customerId},'%')
         </if>
-        <if test="orderDetail.order!=null and  orderDetail.order.customerId != null and orderDetail.order.customerName != ''">
+        <if test="orderDetail.order!=null and  orderDetail.order.customerName != null and orderDetail.order.customerName != ''">
             and b.customer_name like concat('%',#{orderDetail.order.customerName},'%')
         </if>
         <if test="orderDetail.order!=null and  orderDetail.order.project != null and orderDetail.order.project != ''">
@@ -585,6 +587,10 @@
 
         <if test="orderDetail.order!=null and  orderDetail.order.customerBatch != null and orderDetail.order.customerBatch != ''">
             and b.customer_batch like concat('%',#{orderDetail.order.customerBatch},'%')
+        </if>
+
+        <if test="orderDetail.order!=null and  orderDetail.order.otherMoney != null ">
+            and b.other_money  regexp REGEXP_REPLACE(#{orderDetail.order.otherMoney},'\\.0+$','')
         </if>
         group by b.order_id,a.product_id
         order by b.order_id desc
@@ -613,7 +619,7 @@
         <if test="orderDetail.order!=null and  orderDetail.order.customerId != null and orderDetail.order.customerId != ''">
             and b.customer_id like concat('%',#{orderDetail.order.customerId},'%')
         </if>
-        <if test="orderDetail.order!=null and  orderDetail.order.customerId != null and orderDetail.order.customerName != ''">
+        <if test="orderDetail.order!=null and  orderDetail.order.customerName != null and orderDetail.order.customerName != ''">
             and b.customer_name like concat('%',#{orderDetail.order.customerName},'%')
         </if>
         <if test="orderDetail.order!=null and  orderDetail.order.project != null and orderDetail.order.project != ''">
@@ -731,6 +737,10 @@
         <if test="orderDetail.order!=null and  orderDetail.order.customerBatch != null and orderDetail.order.customerBatch != ''">
             and b.customer_batch like concat('%',#{orderDetail.order.customerBatch},'%')
         </if>
+
+        <if test="orderDetail.order!=null and  orderDetail.order.otherMoney != null ">
+            and b.other_money  regexp REGEXP_REPLACE(#{orderDetail.order.otherMoney},'\\.0+$','')
+        </if>
         group by b.order_id,a.product_id
         ) as ss
     </select>
@@ -744,9 +754,7 @@
                a.product_name,
                a.price,
                sum(a.quantity) as quantity,
-               a.gross_amount,
-               a.width,
-               a.height,
+               sum(a.gross_amount) as gross_amount,
                a.shape,
                sum(a.area) as area,
                sum(a.gross_area) as gross_area,
@@ -818,8 +826,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]}
+        where date(b.create_time) >= #{dates[0]}
+          and date(b.create_time) &lt;= #{dates[1]}
         group by b.order_id, a.product_id
         order by b.order_id desc
     </select>

--
Gitblit v1.8.0