|
|
@ -21,7 +21,7 @@ |
|
|
AND a.site = #{site} |
|
|
AND a.site = #{site} |
|
|
</if> |
|
|
</if> |
|
|
<if test="orderNo != null and orderNo != ''"> |
|
|
<if test="orderNo != null and orderNo != ''"> |
|
|
AND a.OrderNo LIKE #{orderNo} |
|
|
|
|
|
|
|
|
AND a.OrderNo LIKE '%' + #{orderNo} + '%' |
|
|
</if> |
|
|
</if> |
|
|
<!-- <if test="status !=null and status != ''">--> |
|
|
<!-- <if test="status !=null and status != ''">--> |
|
|
<!-- AND a.Status IN ${status}--> |
|
|
<!-- AND a.Status IN ${status}--> |
|
|
@ -50,7 +50,7 @@ |
|
|
</if> |
|
|
</if> |
|
|
|
|
|
|
|
|
<if test="partNo != null and partNo != ''"> |
|
|
<if test="partNo != null and partNo != ''"> |
|
|
AND a.PartNo LIKE #{partNo} |
|
|
|
|
|
|
|
|
AND a.PartNo LIKE '%' + #{partNo} + '%' |
|
|
</if> |
|
|
</if> |
|
|
<if test="planStatus != null and planStatus != ''"> |
|
|
<if test="planStatus != null and planStatus != ''"> |
|
|
and ${planStatus} |
|
|
and ${planStatus} |
|
|
@ -120,17 +120,17 @@ |
|
|
AND a.site = #{site} |
|
|
AND a.site = #{site} |
|
|
</if> |
|
|
</if> |
|
|
<if test="orderNo != null and orderNo != ''"> |
|
|
<if test="orderNo != null and orderNo != ''"> |
|
|
AND OrderNo LIKE #{orderNo} |
|
|
|
|
|
|
|
|
AND OrderNo LIKE '%' + #{orderNo} + '%' |
|
|
</if> |
|
|
</if> |
|
|
|
|
|
|
|
|
<if test="seqNo != null "> |
|
|
<if test="seqNo != null "> |
|
|
AND seqNo = #{seqNo} |
|
|
AND seqNo = #{seqNo} |
|
|
</if> |
|
|
</if> |
|
|
<if test="partNo != null and partNo != ''"> |
|
|
<if test="partNo != null and partNo != ''"> |
|
|
AND PartNo LIKE #{partNo} |
|
|
|
|
|
|
|
|
AND PartNo LIKE '%' + #{partNo} + '%' |
|
|
</if> |
|
|
</if> |
|
|
<if test="sWorkCenterNo != null and sWorkCenterNo != ''"> |
|
|
<if test="sWorkCenterNo != null and sWorkCenterNo != ''"> |
|
|
AND S_WorkCenterNo LIKE #{sWorkCenterNo} |
|
|
|
|
|
|
|
|
AND S_WorkCenterNo LIKE '%'+#{sWorkCenterNo}+'%' |
|
|
</if> |
|
|
</if> |
|
|
|
|
|
|
|
|
<if test="itemNo != null and itemNo != ''"> |
|
|
<if test="itemNo != null and itemNo != ''"> |
|
|
@ -155,10 +155,10 @@ |
|
|
and ${reportFlag} |
|
|
and ${reportFlag} |
|
|
</if> |
|
|
</if> |
|
|
<if test="operatorName != null and operatorName != ''"> |
|
|
<if test="operatorName != null and operatorName != ''"> |
|
|
and dbo.Get_OperatorDesc(a.Site,operatorId) like #{operatorName} |
|
|
|
|
|
|
|
|
and dbo.Get_OperatorDesc(a.Site,operatorId) like '%'+#{operatorName}+'%' |
|
|
</if> |
|
|
</if> |
|
|
<if test="sResourceID != null and sResourceID != ''"> |
|
|
<if test="sResourceID != null and sResourceID != ''"> |
|
|
and S_ResourceID like #{sResourceID} |
|
|
|
|
|
|
|
|
and S_ResourceID like '%'+#{sResourceID}+'%' |
|
|
</if> |
|
|
</if> |
|
|
<if test="sShiftNo != null and sShiftNo != ''"> |
|
|
<if test="sShiftNo != null and sShiftNo != ''"> |
|
|
and S_ShiftNo = #{sShiftNo} |
|
|
and S_ShiftNo = #{sShiftNo} |
|
|
@ -237,19 +237,19 @@ |
|
|
|
|
|
|
|
|
and a.AssJobSeqNo is not null |
|
|
and a.AssJobSeqNo is not null |
|
|
<if test="orderNo != null and orderNo != ''"> |
|
|
<if test="orderNo != null and orderNo != ''"> |
|
|
and a.OrderNo like #{orderNo} |
|
|
|
|
|
|
|
|
and a.OrderNo like '%'+#{orderNo}+'%' |
|
|
</if> |
|
|
</if> |
|
|
<if test="workCenterNo != null and workCenterNo != ''"> |
|
|
<if test="workCenterNo != null and workCenterNo != ''"> |
|
|
and a.WorkCenterNo like #{workCenterNo} |
|
|
|
|
|
|
|
|
and a.WorkCenterNo like '%'+#{workCenterNo}+'%' |
|
|
</if> |
|
|
</if> |
|
|
<if test="partNo != null and partNo != ''"> |
|
|
<if test="partNo != null and partNo != ''"> |
|
|
and b.partNo like #{partNo} |
|
|
|
|
|
|
|
|
and b.partNo like '%'+#{partNo}+'%' |
|
|
</if> |
|
|
</if> |
|
|
<if test="itemNo != null and itemNo != ''"> |
|
|
<if test="itemNo != null and itemNo != ''"> |
|
|
and a.ItemNo = #{itemNo} |
|
|
and a.ItemNo = #{itemNo} |
|
|
</if> |
|
|
</if> |
|
|
<if test="operatorName != null and operatorName != ''"> |
|
|
<if test="operatorName != null and operatorName != ''"> |
|
|
and c.OperatorName like #{operatorName} |
|
|
|
|
|
|
|
|
and c.OperatorName like '%'+#{operatorName}+'%' |
|
|
</if> |
|
|
</if> |
|
|
<if test="resourceId != null and resourceId != ''"> |
|
|
<if test="resourceId != null and resourceId != ''"> |
|
|
and a.Scheduled_ResourceId = #{resourceId} |
|
|
and a.Scheduled_ResourceId = #{resourceId} |
|
|
|