From d157234934b92de757717e732d7cf3d68d31fe54 Mon Sep 17 00:00:00 2001
From: liujiang <569804566@qq.com>
Date: Fri, 3 Oct 2025 22:41:45 +0800
Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E7=B3=BB=E7=BB=9F=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xkt/service/impl/StoreProductDemandServiceImpl.java     | 3 ++-
 xkt/src/main/resources/mapper/StoreProductStockMapper.xml   | 6 ++++++
 .../resources/mapper/StoreProductStorageDetailMapper.xml    | 4 ++++
 xkt/src/main/resources/mapper/StoreSaleMapper.xml           | 4 ++++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductDemandServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductDemandServiceImpl.java
index 4ac85993e..3ac5f9fa3 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductDemandServiceImpl.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductDemandServiceImpl.java
@@ -400,7 +400,8 @@ public class StoreProductDemandServiceImpl implements IStoreProductDemandService
     @Transactional(readOnly = true)
     public List<StoreProdDemandDownloadDTO> export(StoreProdDemandExportDTO exportDTO) {
         LambdaQueryWrapper<StoreProductDemandDetail> queryWrapper = new LambdaQueryWrapper<StoreProductDemandDetail>()
-                .eq(StoreProductDemandDetail::getStoreId, exportDTO.getStoreId()).eq(StoreProductDemandDetail::getDelFlag, Constants.UNDELETED);
+                .eq(StoreProductDemandDetail::getStoreId, exportDTO.getStoreId()).eq(StoreProductDemandDetail::getDelFlag, Constants.UNDELETED)
+                .orderByDesc(StoreProductDemandDetail::getCreateTime);
         if (CollectionUtils.isNotEmpty(exportDTO.getStoreProdDemandDetailIdList())) {
             queryWrapper.in(StoreProductDemandDetail::getId, exportDTO.getStoreProdDemandDetailIdList());
         }
diff --git a/xkt/src/main/resources/mapper/StoreProductStockMapper.xml b/xkt/src/main/resources/mapper/StoreProductStockMapper.xml
index 4be3b0c41..48ca7da03 100644
--- a/xkt/src/main/resources/mapper/StoreProductStockMapper.xml
+++ b/xkt/src/main/resources/mapper/StoreProductStockMapper.xml
@@ -124,6 +124,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <foreach collection="storeProdStockIdList" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
+        ORDER BY
+            sps.store_prod_id,
+            sps.store_color_id
     </select>
 
     <select id="selectAllStockList" resultType="com.ruoyi.xkt.dto.storeProductStock.StoreProdStockDownloadDTO">
@@ -156,6 +159,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <foreach collection="storeProdColorIdList" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
+        ORDER BY
+            sps.store_prod_id,
+            sps.store_color_id
     </select>
 
     <select id="selectWebsitePage" resultType="com.ruoyi.xkt.dto.storeProductStock.StoreProdStockWebsitePageResDTO">
diff --git a/xkt/src/main/resources/mapper/StoreProductStorageDetailMapper.xml b/xkt/src/main/resources/mapper/StoreProductStorageDetailMapper.xml
index fbf2ed3f8..b65d1fd24 100644
--- a/xkt/src/main/resources/mapper/StoreProductStorageDetailMapper.xml
+++ b/xkt/src/main/resources/mapper/StoreProductStorageDetailMapper.xml
@@ -56,6 +56,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="storageType != null">
                 AND sps.storage_type = #{storageType}
             </if>
+        ORDER BY
+            spsd.create_time DESC
     </select>
 
     <select id="selectExportListVoucherDateBetween" resultType="com.ruoyi.xkt.dto.storeProdStorage.StoreStorageDetailDownloadDTO">
@@ -111,6 +113,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="storageType != null">
                 AND sps.storage_type = #{storageType}
             </if>
+        ORDER BY
+            spsd.create_time DESC
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/xkt/src/main/resources/mapper/StoreSaleMapper.xml b/xkt/src/main/resources/mapper/StoreSaleMapper.xml
index c2479fa95..21d8391cc 100644
--- a/xkt/src/main/resources/mapper/StoreSaleMapper.xml
+++ b/xkt/src/main/resources/mapper/StoreSaleMapper.xml
@@ -47,6 +47,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <foreach collection="storeSaleIdList" item="storeSaleId" open="(" separator="," close=")">
                 #{storeSaleId}
             </foreach>
+        ORDER BY
+            ss.create_time DESC
     </select>
 
     <select id="selectExportListVoucherDateBetween" resultType="com.ruoyi.xkt.dto.storeSale.StoreSaleDownloadDTO">
@@ -69,6 +71,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ss.del_flag = 0
             AND ss.store_id = #{storeId}
             AND ss.voucher_date BETWEEN #{voucherDateStart} AND #{voucherDateEnd}
+        ORDER BY
+            ss.create_time DESC
     </select>