From 10ffc978dc766dcd383b0be96cc9e94ec935d4f4 Mon Sep 17 00:00:00 2001
From: ShiJiuZhou <15315423958@163.com>
Date: Fri, 24 Apr 2026 13:36:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E8=AF=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/dto/AllocationMessPageDTO.java       |  4 +--
 .../service/impl/WorkOrderServiceImpl.java    |  2 +-
 .../erpdata/mapper/ErpDataLogisticsMapper.xml | 35 +++++++++++--------
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/dto/AllocationMessPageDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/dto/AllocationMessPageDTO.java
index 66686879..51a454ca 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/dto/AllocationMessPageDTO.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/dto/AllocationMessPageDTO.java
@@ -13,7 +13,7 @@ import org.springblade.desk.logistics.pojo.vo.AllocationMessVO;
 @Data
 public class AllocationMessPageDTO extends AllocationMessVO {
 
-    private Integer pageNum;
+    private Integer current;
 
-    private Integer pageSize;
+    private Integer size;
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
index f0ab99b8..eeb5d7ea 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
@@ -2673,7 +2673,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         List<AllocationMessVO> allocationMessList = erpDataLogisticsClient.queryAllocationMess(dto).getData();
         int totalAllocationMessNum = erpDataLogisticsClient.queryAllocationMessNum(dto).getData();
         Map<String,Object> result = new HashMap<>(3);
-        result.put("current",dto.getPageNum());
+        result.put("current",dto.getCurrent());
         result.put("record",allocationMessList);
         result.put("total",totalAllocationMessNum);
         return result;
diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataLogisticsMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataLogisticsMapper.xml
index 2fe3234b..42ab2d94 100644
--- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataLogisticsMapper.xml
+++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataLogisticsMapper.xml
@@ -3,45 +3,50 @@
 <mapper namespace="org.springblade.erpdata.mapper.ErpDataLogisticsMapper">
     <!-- 查询调拨单列表 -->
     <select id="queryAllocationMess" resultType="org.springblade.desk.logistics.pojo.vo.AllocationMessVO">
-        select ROWNUM no,a.* from dba_mgr.v_mes_rb_pkpqry a
+        SELECT * FROM (
+        SELECT t1.*, ROWNUM no FROM (
+        SELECT a.*
+        FROM dba_mgr.v_mes_rb_pkpqry a
         <where>
             <if test="dto.pkno != null and dto.pkno != ''">
-                AND pkno LIKE CONCAT('%', #{dto.pkno}, '%')
+                AND a.pkno LIKE '%' || #{dto.pkno} || '%'
             </if>
             <if test="dto.prntno != null and dto.prntno != ''">
-                AND prntno LIKE CONCAT('%', #{dto.prntno}, '%')
+                AND a.prntno LIKE '%' || #{dto.prntno} || '%'
             </if>
             <if test="dto.mtltmrk != null and dto.mtltmrk != ''">
-                AND mtltmrk = #{dto.mtltmrk}
+                AND a.mtltmrk = #{dto.mtltmrk}
             </if>
             <if test="dto.prtlotno != null and dto.prtlotno != ''">
-                AND prtlotno = #{dto.prtlotno}
+                AND a.prtlotno = #{dto.prtlotno}
             </if>
             <if test="dto.mono != null and dto.mono != ''">
-                AND mono = #{dto.mono}
+                AND a.mono = #{dto.mono}
             </if>
             <if test="dto.schemer != null and dto.schemer != ''">
-                AND schemer = #{dto.schemer}
+                AND a.schemer = #{dto.schemer}
             </if>
             <if test="dto.planner1 != null and dto.planner1 != ''">
-                AND planner1 = #{dto.planner1}
+                AND a.planner1 = #{dto.planner1}
             </if>
             <if test="dto.warctlr != null and dto.warctlr != ''">
-                AND warctlr = #{dto.warctlr}
+                AND a.warctlr = #{dto.warctlr}
             </if>
             <if test="dto.plandept != null and dto.plandept != ''">
-                AND plandept = #{dto.plandept}
+                AND a.plandept = #{dto.plandept}
             </if>
             <if test="dto.prtclass != null and dto.prtclass != ''">
-                AND prtclass = #{dto.prtclass}
+                AND a.prtclass = #{dto.prtclass}
             </if>
         </where>
-        ORDER BY subpkdate DESC
-        <if test="dto.pageNum != null">
-            WHERE no BETWEEN (#{dto.pageNum}-1)*#{dto.getPageSize} +1 AND #{dto.pageNum} * #{dto.getPageSize};
-        </if>
+        ORDER BY a.subpkdate DESC
+        ) t1
+        WHERE ROWNUM &lt;= #{dto.current} * #{dto.size}
+        )
+        WHERE no &gt;= (#{dto.current} - 1) * #{dto.size} + 1
     </select>
 
+
     <!-- 查询调拨单数量 -->
     <select id="queryAllocationMessNum" resultType="java.lang.Integer">
         SELECT COUNT(1) FROM dba_mgr.v_mes_rb_pkpqry