From fe3377858baa26f85cf2518cfc480ef7b9d66a19 Mon Sep 17 00:00:00 2001
From: ShiJiuZhou <15315423958@163.com>
Date: Fri, 24 Apr 2026 18:30:31 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E5=A5=97=E4=BF=A1=E6=81=AF=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=96=B0=E5=8A=A0=E9=85=8D?=
 =?UTF-8?q?=E5=A5=97=E5=BC=80=E5=A7=8B=EF=BC=8C=E7=BB=93=E6=9D=9F=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erpdata/mapper/ErpDataLogisticsMapper.xml | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

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 f3ab3639..4f5ae815 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
@@ -237,15 +237,20 @@
         </where>
         GROUP BY a.prtmdept, a.subpkdate
         ) s
-        LEFT JOIN dba_mgr.v_mes_rb_pkpqry d
+        LEFT JOIN (
+        SELECT *
+        FROM (
+        SELECT d.*,
+        ROW_NUMBER() OVER (
+        PARTITION BY d.prtmdept, d.subpkdate
+        ORDER BY d.pkreqdat DESC, d.pkno DESC
+        ) rn
+        FROM dba_mgr.v_mes_rb_pkpqry d
+        ) dd
+        WHERE dd.rn = 1
+        ) d
         ON d.prtmdept = s.prtmdept
         AND d.subpkdate = s.subpkdate
-        AND d.rowid = (
-        SELECT MIN(x.rowid)
-        FROM dba_mgr.v_mes_rb_pkpqry x
-        WHERE x.prtmdept = s.prtmdept
-        AND x.subpkdate = s.subpkdate
-        )
         ORDER BY s.subpkdate DESC, s.prtmdept DESC
         ) t
         WHERE ROWNUM &lt;= #{dto.current} * #{dto.size}
@@ -253,6 +258,7 @@
         WHERE no &gt;= (#{dto.current} - 1) * #{dto.size} + 1
     </select>
 
+
     <select id="queryAllocationStatisticsNum" resultType="java.lang.Integer">
         SELECT COUNT(1)
         FROM (