From c12e4a831b4210ec886b2537824a464d74b59ff5 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 10 三月 2025 14:46:28 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml |   46 +++++++++++++++++++++++++++++++++++++---------
 1 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
index 4772527..a5ae3ad 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -102,8 +102,8 @@
     </update>
     
     <select id="getOrderList">
-        select
-            *,
+       select * from (select
+            o.*,
         ifnull(sum(fgi.quantity_available),0) as goodsQuantity
         from
             sd.`order` as o
@@ -196,16 +196,38 @@
             and o.processing_note REGEXP #{order.processingNote}
         </if>
         group by o.id
-        order by o.id desc
+        ) as acc
+        order by
+        <if test="orderBy == null ">
+            order_id desc
+        </if>
+        <if test="orderBy == 'desc'">
+            ${field} desc
+        </if>
+        <if test="orderBy == 'asc'">
+            ${field}
+        </if>
         limit #{offset},#{pageSize}
     </select>
 
     <select id="getPageTotal">
         select
             CEILING(count(o.id)/#{pageSize}) as 'pageTotal',
-            count(o.id) as 'total'
+            count(o.id) as 'dataTotal',
+            sum(o.quantity) as quantity,
+            sum(o.area) as area,
+            sum(o.money) as money,
+            ifnull(fgi.goodsQuantity ,0) as goodsQuantity ,
+            ROUND(sum(perimeter),2) as perimeter,
+            #{pageSize} as pageSize
         from
         `order` as o
+        left join(
+                    select order_id,
+                           ifnull(sum(quantity_available),0) as goodsQuantity
+                    from mm.finished_goods_inventory group by order_id
+                    )  as  fgi
+        on o.order_id = fgi.order_id
         where date (o.create_time)>=#{startDate} and date(o.create_time) &lt;= #{endDate}
             <if test="orderType!= null and orderType != 0">
                 and o.create_order = #{orderType}
@@ -308,6 +330,13 @@
         where order_id = #{id}
     </update>
 
+    <update id="backReviewOrderById">
+        update `order` set order_review = 0,
+                           verifier_id = null,
+                           verifier = null
+        where order_id = #{id}
+    </update>
+
     <update id="reviewProcessById">
         update `order` set process_review = #{status} where order_id = #{id}
     </update>
@@ -337,18 +366,17 @@
     </update>
 
     <select id="selectDifferentSize">
-
     select a.order_number,count(a.order_number),a.order_id from(select order_id,order_number
     from sd.order_glass_detail ogd
     where ogd.order_id = #{orderId}
     group by ogd.order_number,ogd.child_height,child_width)
     as a
-    inner join order_detail od
-        on od.order_id = a.order_id
-        and od.order_number = a.order_number
-        and (od.bend_radius is null or od.bend_radius = '')
     group by a.order_number
     having count(a.order_number) > 1
     </select>
 
+    <select id="searchOrderWarehousing">
+        select  warehousing from `order`
+        where order_id = #{orderId}
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0