|
|
|
|
@ -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 <= #{dto.current} * #{dto.size} |
|
|
|
|
) |
|
|
|
|
WHERE no >= (#{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> |
|
|
|
|
|
|
|
|
|
|