|
|
|
@ -1215,11 +1215,11 @@
|
|
|
|
|
INNER JOIN OPERATION O ON O.SITE = WIP.SITE AND O.OPERATION = zsd2.OPERATION AND O.CURRENT_REVISION = 'true'
|
|
|
|
|
LEFT JOIN OPERATION_T OT ON OT.OPERATION_BO = O.HANDLE AND OT.LOCALE = 'zh'
|
|
|
|
|
<where>
|
|
|
|
|
<if test="finished = 'true'">
|
|
|
|
|
WIP.rate = 100.00
|
|
|
|
|
<if test="workOrder != null and finished == 'true'">
|
|
|
|
|
AND WIP.rate = 100.00
|
|
|
|
|
</if>
|
|
|
|
|
<if test="finished = 'false'">
|
|
|
|
|
WIP.rate != 100.00
|
|
|
|
|
<if test="workOrder != null and finished == 'false'">
|
|
|
|
|
AND WIP.rate != 100.00
|
|
|
|
|
</if>
|
|
|
|
|
<if test="workOrder != null and workOrder != ''">
|
|
|
|
|
AND WIP.workOrder like '%${workOrder}%'
|
|
|
|
@ -1602,7 +1602,6 @@
|
|
|
|
|
GROUP BY O.OPERATION,OT.DESCRIPTION,WCT.DESCRIPTION,RT.DESCRIPTION
|
|
|
|
|
ORDER BY "tardinessWork" DESC ) WIP
|
|
|
|
|
LEFT JOIN CUSTOM_FIELDS CF ON CF.ATTRIBUTE ='WEEK_CAPACITY' AND CF.HANDLE = 'OperationBO:1000,'|| WIP."operation" || ',1.0'
|
|
|
|
|
|
|
|
|
|
<where>
|
|
|
|
|
1=1
|
|
|
|
|
<if test="operation != null and operation != ''">
|
|
|
|
@ -1719,7 +1718,7 @@
|
|
|
|
|
SELECT WIP.WORK_CENTER "workCenter",
|
|
|
|
|
WIP.OPERATION "operationCode",
|
|
|
|
|
WIP.OPERATION_DESCRIPTION "operationDescription",
|
|
|
|
|
WIP.RESRCE_DESCRIPTION "resrceDescription",
|
|
|
|
|
WIP.RESOURCE_TYPE_DESCRIPTION "resrceDescription",
|
|
|
|
|
WIP.SUM_QTY "sumQTY",
|
|
|
|
|
WIP.SUM_DONE_QTY "sumDoneQTY",
|
|
|
|
|
TO_CHAR(DECODE(WIP.SUM_QTY,0,0,WIP.SUM_DONE_QTY / WIP.SUM_QTY) * 100, '99990.99') || '%' "QTYrate",
|
|
|
|
@ -1730,7 +1729,7 @@
|
|
|
|
|
(SELECT wct.DESCRIPTION WORK_CENTER,
|
|
|
|
|
o.OPERATION OPERATION,
|
|
|
|
|
OT.DESCRIPTION OPERATION_DESCRIPTION,
|
|
|
|
|
r.DESCRIPTION RESRCE_DESCRIPTION,
|
|
|
|
|
RT.DESCRIPTION RESOURCE_TYPE_DESCRIPTION,
|
|
|
|
|
SUM(zsd.DISPATCH_QTY) SUM_QTY,
|
|
|
|
|
SUM(CASE
|
|
|
|
|
WHEN zsd.DISPATCH_STATUS = 'COMPLETE' AND SYSDATE > zsd.ACTUAL_COMPLETE_DATE THEN zsd.DISPATCH_QTY
|
|
|
|
@ -1742,12 +1741,15 @@
|
|
|
|
|
FROM Z_SFC_DISPATCH zsd
|
|
|
|
|
LEFT JOIN WORK_CENTER wc ON zsd.WORK_CENTER = wc.WORK_CENTER
|
|
|
|
|
LEFT JOIN WORK_CENTER_T wct ON wc.HANDLE = wct.WORK_CENTER_BO
|
|
|
|
|
LEFT JOIN RESRCE r ON r.RESRCE = zsd.RESRCE AND r.SITE = zsd.SITE
|
|
|
|
|
LEFT JOIN RESOURCE_TYPE RT ON ZSD.RESOURCE_TYPE = RT.RESOURCE_TYPE
|
|
|
|
|
LEFT JOIN OPERATION O ON O.OPERATION = ZSD.OPERATION AND O.SITE = ZSD.SITE
|
|
|
|
|
LEFT JOIN OPERATION_T OT ON O.HANDLE = OT.OPERATION_BO
|
|
|
|
|
WHERE zsd.DISPATCH_STATUS != 'CANCEL'
|
|
|
|
|
AND zsd.DISPATCH_STATUS != 'NEW'
|
|
|
|
|
AND zsd.RESRCE IS NOT NULL
|
|
|
|
|
AND RT.RESOURCE_TYPE IS NOT NULL
|
|
|
|
|
<if test="resourceType != null and resourceType != ''">
|
|
|
|
|
AND RT.RESOURCE_TYPE = #{resourceType}
|
|
|
|
|
</if>
|
|
|
|
|
<if test="workCenter != null and workCenter != ''">
|
|
|
|
|
AND wc.WORK_CENTER = #{workCenter}
|
|
|
|
|
</if>
|
|
|
|
@ -1757,12 +1759,9 @@
|
|
|
|
|
<if test="endDate != null and endDate != ''">
|
|
|
|
|
AND to_char(zsd.PLANNED_COMP_DATE,'YYYY-mm-dd') <= #{endDate}
|
|
|
|
|
</if>
|
|
|
|
|
GROUP BY wct.DESCRIPTION,o.OPERATION, r.DESCRIPTION, OT.DESCRIPTION) WIP
|
|
|
|
|
GROUP BY wct.DESCRIPTION,o.OPERATION, RT.DESCRIPTION, OT.DESCRIPTION) WIP
|
|
|
|
|
<where>
|
|
|
|
|
1=1
|
|
|
|
|
<if test="resrce != null and resrce != ''">
|
|
|
|
|
AND WIP.RESRCE = #{resrce}
|
|
|
|
|
</if>
|
|
|
|
|
<if test="operationDescription != null and operationDescription != ''">
|
|
|
|
|
AND WIP.OPERATION_DESCRIPTION = #{operationDescription}
|
|
|
|
|
</if>
|
|
|
|
@ -1773,7 +1772,7 @@
|
|
|
|
|
SELECT WIP.WORK_CENTER "workCenter",
|
|
|
|
|
WIP.OPERATION "operationCode",
|
|
|
|
|
WIP.OPERATION_DESCRIPTION "operationDescription",
|
|
|
|
|
WIP.RESRCE_DESCRIPTION "resrceDescription",
|
|
|
|
|
WIP.RESOURCE_TYPE_DESCRIPTION "resrceDescription",
|
|
|
|
|
WIP.SUM_QTY "sumQTY",
|
|
|
|
|
WIP.SUM_DONE_QTY "sumDoneQTY",
|
|
|
|
|
TO_CHAR(DECODE(WIP.SUM_QTY,0,0,WIP.SUM_DONE_QTY / WIP.SUM_QTY) * 100, '99990.99') || '%' "QTYrate",
|
|
|
|
@ -1784,7 +1783,7 @@
|
|
|
|
|
(SELECT wct.DESCRIPTION WORK_CENTER,
|
|
|
|
|
o.OPERATION OPERATION,
|
|
|
|
|
OT.DESCRIPTION OPERATION_DESCRIPTION,
|
|
|
|
|
r.DESCRIPTION RESRCE_DESCRIPTION,
|
|
|
|
|
RT.DESCRIPTION RESOURCE_TYPE_DESCRIPTION,
|
|
|
|
|
SUM(zsd.DISPATCH_QTY) SUM_QTY,
|
|
|
|
|
SUM(CASE
|
|
|
|
|
WHEN zsd.DISPATCH_STATUS = 'COMPLETE' AND zsd.PLANNED_COMP_DATE > zsd.ACTUAL_COMPLETE_DATE THEN zsd.DISPATCH_QTY
|
|
|
|
@ -1796,12 +1795,15 @@
|
|
|
|
|
FROM Z_SFC_DISPATCH zsd
|
|
|
|
|
LEFT JOIN WORK_CENTER wc ON zsd.WORK_CENTER = wc.WORK_CENTER
|
|
|
|
|
LEFT JOIN WORK_CENTER_T wct ON wc.HANDLE = wct.WORK_CENTER_BO
|
|
|
|
|
LEFT JOIN RESRCE r ON r.RESRCE = zsd.RESRCE AND r.SITE = zsd.SITE
|
|
|
|
|
LEFT JOIN RESOURCE_TYPE RT ON ZSD.RESOURCE_TYPE = RT.RESOURCE_TYPE
|
|
|
|
|
LEFT JOIN OPERATION O ON O.OPERATION = ZSD.OPERATION AND O.SITE = ZSD.SITE
|
|
|
|
|
LEFT JOIN OPERATION_T OT ON O.HANDLE = OT.OPERATION_BO
|
|
|
|
|
WHERE zsd.DISPATCH_STATUS != 'CANCEL'
|
|
|
|
|
AND zsd.DISPATCH_STATUS != 'NEW'
|
|
|
|
|
AND zsd.RESRCE IS NOT NULL
|
|
|
|
|
AND RT.RESOURCE_TYPE IS NOT NULL
|
|
|
|
|
<if test="resourceType != null and resourceType != ''">
|
|
|
|
|
AND RT.RESOURCE_TYPE = #{resourceType}
|
|
|
|
|
</if>
|
|
|
|
|
<if test="workCenter != null and workCenter != ''">
|
|
|
|
|
AND wc.WORK_CENTER = #{workCenter}
|
|
|
|
|
</if>
|
|
|
|
@ -1811,12 +1813,10 @@
|
|
|
|
|
<if test="endDate != null and endDate != ''">
|
|
|
|
|
AND to_char(zsd.PLANNED_COMP_DATE,'yyyy-mm') <= #{endDate}
|
|
|
|
|
</if>
|
|
|
|
|
GROUP BY wct.DESCRIPTION,o.OPERATION, r.DESCRIPTION, OT.DESCRIPTION) WIP
|
|
|
|
|
GROUP BY wct.DESCRIPTION,o.OPERATION, RT.DESCRIPTION, OT.DESCRIPTION) WIP
|
|
|
|
|
<where>
|
|
|
|
|
1=1
|
|
|
|
|
<if test="resrce != null and resrce != ''">
|
|
|
|
|
AND WIP.RESRCE = #{resrce}
|
|
|
|
|
</if>
|
|
|
|
|
|
|
|
|
|
<if test="operationDescription != null and operationDescription != ''">
|
|
|
|
|
AND WIP.OPERATION_DESCRIPTION = #{operationDescription}
|
|
|
|
|
</if>
|
|
|
|
|