From bad9ff47e7ed4965c6b3e93aebc38f28e97cca68 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 08 十二月 2025 16:11:00 +0800
Subject: [PATCH] 发货查询以及可发货订单查询筛选缓存

---
 north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
index 337f2c0..57931dc 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml
@@ -179,9 +179,6 @@
             <if test="order.createTime != null and order.createTime != ''">
                 and o.create_time REGEXP #{order.createTime}
             </if>
-            <if test="order.finishedGoodsInventory.quantityAvailable != null and order.finishedGoodsInventory.quantityAvailable != ''">
-                and fgi.quantity_available REGEXP #{order.finishedGoodsInventory.quantityAvailable}
-            </if>
         </where>
         group by o.order_id order by o.id desc
         limit #{offset},#{pageSize};
@@ -236,9 +233,6 @@
             </if>
             <if test="order.createTime != null and order.createTime != ''">
                 and o.create_time REGEXP #{order.createTime}
-            </if>
-            <if test="order.finishedGoodsInventory.quantityAvailable != null and order.finishedGoodsInventory.quantityAvailable != ''">
-                and fgi.quantity_available REGEXP #{order.finishedGoodsInventory.quantityAvailable}
             </if>
         </where>
         group by o.order_id limit #{offset},#{pageSize}) as zu;
@@ -350,7 +344,16 @@
 
             </where>
         group by d.delivery_id
-        order by d.id desc
+        order by
+        <if test="orderBy == null ">
+            d.id desc
+        </if>
+        <if test="orderBy == 'desc'">
+            d.${field} desc
+        </if>
+        <if test="orderBy == 'asc'">
+            d.${field}
+        </if>
         limit #{offset},#{pageSize};
     </select>
 

--
Gitblit v1.8.0