|
|
|
@ -894,7 +894,7 @@
|
|
|
|
|
INNER JOIN WIP.RESRCE R ON RRT.SITE = R.SITE AND R.RESRCE = RRT.RESOURCE_NO
|
|
|
|
|
LEFT JOIN WIP.WORK_CENTER_MEMBER WCM ON WCM.WORK_CENTER_OR_RESOURCE_GBO = R.HANDLE
|
|
|
|
|
LEFT JOIN WIP.WORK_CENTER_MEMBER WCMA ON WCMA.WORK_CENTER_OR_RESOURCE_GBO = WCM.WORK_CENTER_BO
|
|
|
|
|
LEFT JOIN WIP.WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WCMA.WORK_CENTER_BO
|
|
|
|
|
LEFT JOIN WIP.WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WCMA.WORK_CENTER_BO AND WCT.LOCALE = 'zh'
|
|
|
|
|
INNER JOIN WIP.RESOURCE_TYPE_RESOURCE RTR ON RTR.RESOURCE_BO = R.HANDLE
|
|
|
|
|
WHERE RRT.SITE = #{site}
|
|
|
|
|
<if test="resourceNo != null and resourceNo != ''">
|
|
|
|
@ -910,7 +910,7 @@
|
|
|
|
|
AND RRT.STATUS = #{status}
|
|
|
|
|
</if>
|
|
|
|
|
<if test="workCenterBo != null and workCenterBo != ''">
|
|
|
|
|
AND WCM.WORK_CENTER_BO = #{workCenterBo}
|
|
|
|
|
AND WCMA.WORK_CENTER_BO = #{workCenterBo}
|
|
|
|
|
</if>
|
|
|
|
|
<if test="resourceTypeBo != null and resourceTypeBo != ''">
|
|
|
|
|
AND RTR.RESOURCE_TYPE_BO = #{resourceTypeBo}
|
|
|
|
|