|
|
|
@ -379,8 +379,8 @@
|
|
|
|
|
<if test="et.resourceType!=null">RESOURCE_TYPE=#{et.resourceType},</if>
|
|
|
|
|
<if test="et.workCenter!=null">WORK_CENTER=#{et.workCenter},</if>
|
|
|
|
|
<if test="et.resrce!=null">RESRCE=#{et.resrce},</if>
|
|
|
|
|
<if test="et.employee!=null">EMPLOYEE=#{et.employee},</if>
|
|
|
|
|
<if test="et.employeeDescription!=null">EMPLOYEE_DESCRIPTION=#{et.employeeDescription},</if>
|
|
|
|
|
EMPLOYEE=#{et.employee},
|
|
|
|
|
EMPLOYEE_DESCRIPTION=#{et.employeeDescription},
|
|
|
|
|
<if test="et.turnOperation!=null">TURN_OPERATION=#{et.turnOperation},</if>
|
|
|
|
|
<if test="et.dispatchQty!=null">DISPATCH_QTY=#{et.dispatchQty},</if>
|
|
|
|
|
<if test="et.prodHours!=null">PROD_HOURS=#{et.prodHours},</if>
|
|
|
|
@ -692,7 +692,7 @@
|
|
|
|
|
LEFT JOIN CUSTOM_FIELDS C2 ON C2.HANDLE = SO.HANDLE AND C2."ATTRIBUTE" = 'ITEM_NUMBER'
|
|
|
|
|
INNER JOIN ITEM IM ON IM.HANDLE = SO.ITEM_BO
|
|
|
|
|
LEFT JOIN ITEM_T IT ON IT.ITEM_BO = IM.HANDLE AND IT.LOCALE = 'zh'
|
|
|
|
|
LEFT JOIN CUSTOM_FIELDS CC ON CC.HANDLE = IT.HANDLE AND CC.ATTRIBUTE = 'ACCESSORY_TYPE'
|
|
|
|
|
LEFT JOIN CUSTOM_FIELDS CC ON CC.HANDLE = IM.HANDLE AND CC.ATTRIBUTE = 'ACCESSORY_TYPE'
|
|
|
|
|
INNER JOIN OPERATION O ON O.SITE = SD.SITE AND O.OPERATION = SD.OPERATION AND O.CURRENT_REVISION = 'true'
|
|
|
|
|
LEFT JOIN OPERATION_T OT ON OT.OPERATION_BO = O.HANDLE AND OT.LOCALE = 'zh'
|
|
|
|
|
INNER JOIN BOM_COMPONENT BC ON BC.BOM_BO = SO.BOM_BO
|
|
|
|
@ -761,16 +761,16 @@
|
|
|
|
|
AND C4.VALUE = #{matSpec}
|
|
|
|
|
</if>
|
|
|
|
|
<if test="startFromDate != null">
|
|
|
|
|
AND SO.PLANNED_START_DATE >= TO_DATE(#{startFromDate}, 'YYYY-MM-DD')
|
|
|
|
|
AND SD.PLANNED_START_DATE >= TO_DATE(#{startFromDate}, 'YYYY-MM-DD')
|
|
|
|
|
</if>
|
|
|
|
|
<if test="startToDate != null">
|
|
|
|
|
AND SO.PLANNED_START_DATE <= TO_DATE(#{startToDate}|| '23:59:59', 'YYYY-MM-DD HH24:MI:SS')
|
|
|
|
|
AND SD.PLANNED_START_DATE <= TO_DATE(#{startToDate}|| '23:59:59', 'YYYY-MM-DD HH24:MI:SS')
|
|
|
|
|
</if>
|
|
|
|
|
<if test="completeFromDate != null">
|
|
|
|
|
AND SO.PLANNED_COMP_DATE >= TO_DATE(#{completeFromDate}, 'YYYY-MM-DD')
|
|
|
|
|
AND SD.PLANNED_COMPLETE_DATE >= TO_DATE(#{completeFromDate}, 'YYYY-MM-DD')
|
|
|
|
|
</if>
|
|
|
|
|
<if test="completeToDate != null">
|
|
|
|
|
AND SO.PLANNED_COMP_DATE <= TO_DATE(#{completeToDate}|| '23:59:59', 'YYYY-MM-DD HH24:MI:SS')
|
|
|
|
|
AND SD.PLANNED_COMPLETE_DATE <= TO_DATE(#{completeToDate}|| '23:59:59', 'YYYY-MM-DD HH24:MI:SS')
|
|
|
|
|
</if>
|
|
|
|
|
GROUP BY SD.HANDLE, SD.SITE, SD.SHOP_ORDER, SD.DISPATCH_NO, C2.VALUE, C1.VALUE, IM.HANDLE, IM.ITEM, IT.DESCRIPTION, SD.SFC, SD.DISPATCH_STATUS,
|
|
|
|
|
SD.STEP_ID, SD.OPERATION, OT.DESCRIPTION, SD.RESOURCE_TYPE, SD.RESRCE, SD.EMPLOYEE, SD.EMPLOYEE, SD.DISPATCH_QTY, SD.PROD_HOURS, RS.DESCRIPTION,
|
|
|
|
|