From b9fa1c266e2d51388a757cf361680d82f6edfbea Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 08 十二月 2025 15:49:59 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
index 8da1dbe..e921024 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
@@ -293,7 +293,7 @@
             </if>
 
         </where>
-        order by dd.id
+        order by dd.box_no,dd.order_id,dd.order_number
     </select>
 
     <select id="getSelectShippingOrderDetailPageTotal">
@@ -486,6 +486,7 @@
                 and od.perimeter regexp #{orderDetail.perimeter}
             </if>
         </where>
+        order by od.order_id,od.order_number
     </select>
 
     <select id="getSelectShippingOrderDetailsPageTotal">

--
Gitblit v1.8.0