From a3de906880efd942ef66aaf07b1cbc2a673cfc8d Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 30 Oct 2025 09:46:00 +0800
Subject: [PATCH] =?UTF-8?q?2025-10-30=20=E7=94=9F=E4=BA=A7=E6=B4=BE?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=88=97=E8=A1=A8=E6=94=AF=E6=8C=81=E6=8B=96?=
 =?UTF-8?q?=E6=8B=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/shopOrder/ShopOrderMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
index b5b09f0..fc02969 100644
--- a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
+++ b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml
@@ -209,8 +209,8 @@
                 AND dateadd( DAY, 1, #{date6} ) > T.PlanFinishTime
             </if>
             ${sql}
-                order  by d.bu_no, T.S_ResourceID, ISNULL(T.serial_number, 999999)
         </where>
+        ORDER BY d.bu_no, T.S_ResourceID, ISNULL(T.serial_number, 999999)
     </select>
     <select id="searchShopOrder" resultType="com.gaotao.modules.shopOrder.entity.SearchShopOrder">
         Select T.OrderNo,T.NeedDate,T.OrderType,T.PartNo,p.PartDescription+' / '+isnull(p.Spec,'') as PartDescription,