blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataLogisticsMapper.xml

@@ -146,8 +146,7 @@
 
     <select id="queryAllocationStatistics" resultType="org.springblade.desk.logistics.pojo.vo.AllocationMessVO">
         SELECT * FROM (
-        SELECT t.*, ROWNUM no
+        SELECT t.*, ROWNUM no FROM (
-        FROM (
         SELECT
         d.pkno,
         d.prntno,
@@ -162,7 +161,7 @@
         d.mono,
         d.schemer,
         d.planner1,
-        s.subpkdate_day AS subpkdate,
+        d.subpkdate,
         d.warctlr,
         d.barcodeno,
         d.plndept,
@@ -171,7 +170,7 @@
         FROM (
         SELECT
         a.prtmdept,
-        TRUNC(a.subpkdate) AS subpkdate_day,
+        a.subpkdate,
         SUM(NVL(a.fj_pkavqty, 0)) AS fjpkavqty
         FROM dba_mgr.v_mes_rb_pkpqry a
         <where>
@@ -236,15 +235,14 @@
                 AND a.prtclass = #{dto.prtclass}
             </if>
         </where>
-        GROUP BY a.prtmdept, TRUNC(a.subpkdate)
+        GROUP BY a.prtmdept, a.subpkdate
         ) s
         LEFT JOIN (
         SELECT *
         FROM (
-        SELECT
+        SELECT d.*,
-        d.*,
         ROW_NUMBER() OVER (
-        PARTITION BY d.prtmdept, TRUNC(d.subpkdate)
+        PARTITION BY d.prtmdept, d.subpkdate
         ORDER BY d.pkreqdat DESC, d.pkno DESC
         ) rn
         FROM dba_mgr.v_mes_rb_pkpqry d
@@ -252,8 +250,8 @@
         WHERE dd.rn = 1
         ) d
         ON d.prtmdept = s.prtmdept
-        AND TRUNC(d.subpkdate) = s.subpkdate_day
+        AND d.subpkdate = s.subpkdate
-        ORDER BY s.subpkdate_day DESC, s.prtmdept DESC
+        ORDER BY s.subpkdate DESC, s.prtmdept DESC
         ) t
         WHERE ROWNUM &lt;= #{dto.current} * #{dto.size}
         )
@@ -328,9 +326,8 @@
                 AND a.prtclass = #{dto.prtclass}
             </if>
         </where>
-        GROUP BY a.prtmdept, TRUNC(a.subpkdate)
+        GROUP BY a.prtmdept, a.subpkdate
         ) c
     </select>
 
-
 </mapper>