From 7c3483d7d89aad0dcdf3faf750b3226e0fd078c1 Mon Sep 17 00:00:00 2001
From: ShiJiuZhou <15315423958@163.com>
Date: Sat, 25 Apr 2026 19:04:03 +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 | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 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 68d67bd3..e5325f11 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
@@ -146,7 +146,8 @@
 
     <select id="queryAllocationStatistics" resultType="org.springblade.desk.logistics.pojo.vo.AllocationMessVO">
         SELECT * FROM (
-        SELECT t.*, ROWNUM no FROM (
+        SELECT t.*, ROWNUM no
+        FROM (
         SELECT
         d.pkno,
         d.prntno,
@@ -161,7 +162,7 @@
         d.mono,
         d.schemer,
         d.planner1,
-        d.subpkdate,
+        s.subpkdate_day AS subpkdate,
         d.warctlr,
         d.barcodeno,
         d.plndept,
@@ -170,7 +171,7 @@
         FROM (
         SELECT
         a.prtmdept,
-        a.subpkdate,
+        TRUNC(a.subpkdate) AS subpkdate_day,
         SUM(NVL(a.fj_pkavqty, 0)) AS fjpkavqty
         FROM dba_mgr.v_mes_rb_pkpqry a
         <where>
@@ -235,14 +236,15 @@
                 AND a.prtclass = #{dto.prtclass}
             </if>
         </where>
-        GROUP BY a.prtmdept, a.subpkdate
+        GROUP BY a.prtmdept, TRUNC(a.subpkdate)
         ) s
         LEFT JOIN (
         SELECT *
         FROM (
-        SELECT d.*,
+        SELECT
+        d.*,
         ROW_NUMBER() OVER (
-        PARTITION BY d.prtmdept, d.subpkdate
+        PARTITION BY d.prtmdept, TRUNC(d.subpkdate)
         ORDER BY d.pkreqdat DESC, d.pkno DESC
         ) rn
         FROM dba_mgr.v_mes_rb_pkpqry d
@@ -250,8 +252,8 @@
         WHERE dd.rn = 1
         ) d
         ON d.prtmdept = s.prtmdept
-        AND d.subpkdate = s.subpkdate
-        ORDER BY s.subpkdate DESC, s.prtmdept DESC
+        AND TRUNC(d.subpkdate) = s.subpkdate_day
+        ORDER BY s.subpkdate_day DESC, s.prtmdept DESC
         ) t
         WHERE ROWNUM &lt;= #{dto.current} * #{dto.size}
         )
@@ -326,8 +328,9 @@
                 AND a.prtclass = #{dto.prtclass}
             </if>
         </where>
-        GROUP BY a.prtmdept, a.subpkdate
+        GROUP BY a.prtmdept, TRUNC(a.subpkdate)
         ) c
     </select>
 
+
 </mapper>
\ No newline at end of file