From 69abc2fe603e5e6282e6ff6d70463f93fdadce52 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 18 十一月 2025 15:33:18 +0800
Subject: [PATCH] *

---
 src/main/resources/mapper/OrderDetlPakoutMapper.xml |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/mapper/OrderDetlPakoutMapper.xml b/src/main/resources/mapper/OrderDetlPakoutMapper.xml
index d0cd5fa..aacf6a5 100644
--- a/src/main/resources/mapper/OrderDetlPakoutMapper.xml
+++ b/src/main/resources/mapper/OrderDetlPakoutMapper.xml
@@ -53,6 +53,7 @@
     <!-- 鏄庣粏瑙嗗浘B鐨勯�氱敤鏌ヨ鏄犲皠缁撴灉 -->
     <resultMap id="PakoutDetailResultMap" type="com.zy.asrs.entity.result.OrderPakoutDetailVo">
         <id column="id" property="id" jdbcType="BIGINT"/>
+        <result column="row" property="row" jdbcType="BIGINT"/>
         <result column="item_name" property="itemName" jdbcType="VARCHAR"/>
         <result column="matnr" property="matnr" jdbcType="VARCHAR"/>
         <result column="batch" property="batch" jdbcType="VARCHAR"/>
@@ -256,12 +257,24 @@
     </update>
 
     <select id="selectOrderPakoutDetailVoList" resultMap="PakoutDetailResultMap">
-        SELECT * FROM v_pakout_detail
-        WHERE 1 = 1
-        <if test="itemName != null and itemName != ''">
-            AND item_name LIKE CONCAT('%', #{itemName}, '%')
-        </if>
-        ORDER BY create_time DESC
+        select d.* from (
+            select
+            ROW_NUMBER() over (order by c.update_time desc) as row1,
+            c.* from (
+                select a.* from v_pakout_detail as a
+                where 1=1
+                <if test="itemName != null and itemName != ''">
+                    AND item_name LIKE CONCAT('%', #{itemName}, '%')
+                </if>
+            ) as c
+        ) as d
+        where d.row1 between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize}) order by d.update_time desc
+    </select>
+
+    <select id="selectOrderPakoutDetailVoListV1" resultMap="PakoutDetailResultMap">
+        select a.* from v_pakout_detail as a
+        where 1=1
+        AND item_name = #{itemName}
     </select>
 
     <select id="selectOrderPakoutDetailVoListTotal" resultType="Long">

--
Gitblit v1.9.1