From 6643d59985360c9c82280cda52c86c795317370f Mon Sep 17 00:00:00 2001
From: ShiJiuZhou <15315423958@163.com>
Date: Sat, 25 Apr 2026 21:08:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erpdata/mapper/ErpDataLogisticsMapper.xml     | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 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 0d94547b..c98c1cc4 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
@@ -165,12 +165,12 @@
         s.subpkdate_day AS subpkdate,
         d.warctlr,
         d.barcodeno,
-        d.plndept,
+        s.plndept,
         d.remark,
         d.prtclass
         FROM (
         SELECT
-        a.prtmdept,
+        a.plndept,
         TRUNC(a.subpkdate) AS subpkdate_day,
         SUM(NVL(a.fj_pkavqty, 0)) AS fjpkavqty
         FROM dba_mgr.v_mes_rb_pkpqry a
@@ -236,7 +236,7 @@
                 AND a.prtclass = #{dto.prtclass}
             </if>
         </where>
-        GROUP BY a.prtmdept, TRUNC(a.subpkdate)
+        GROUP BY a.plndept, TRUNC(a.subpkdate)
         ) s
         LEFT JOIN (
         SELECT *
@@ -244,23 +244,22 @@
         SELECT
         d.*,
         ROW_NUMBER() OVER (
-        PARTITION BY d.prtmdept, TRUNC(d.subpkdate)
+        PARTITION BY d.plndept, TRUNC(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
+        ON d.plndept = s.plndept
         AND TRUNC(d.subpkdate) = s.subpkdate_day
-        ORDER BY s.subpkdate_day DESC, s.prtmdept DESC
+        ORDER BY s.subpkdate_day DESC, s.plndept DESC
         ) t
         WHERE ROWNUM &lt;= #{dto.current} * #{dto.size}
         )
         WHERE no &gt;= (#{dto.current} - 1) * #{dto.size} + 1
     </select>
 
-
     <select id="queryAllocationStatisticsNum" resultType="java.lang.Integer">
         SELECT COUNT(1)
         FROM (
@@ -328,7 +327,7 @@
                 AND a.prtclass = #{dto.prtclass}
             </if>
         </where>
-        GROUP BY a.prtmdept, TRUNC(a.subpkdate)
+        GROUP BY a.plndept, TRUNC(a.subpkdate)
         ) c
     </select>