|
@@ -780,7 +780,7 @@
|
|
ON RCT.CAPACITY_TYPE_ID=AIR.CAPACITY_TYPE_ID
|
|
ON RCT.CAPACITY_TYPE_ID=AIR.CAPACITY_TYPE_ID
|
|
where TTTR.RESULT_TIME_TYPE = 3 AND TTTR.RESULT_VALUE IS NOT NULL
|
|
where TTTR.RESULT_TIME_TYPE = 3 AND TTTR.RESULT_VALUE IS NOT NULL
|
|
<if test="orderType!=null">
|
|
<if test="orderType!=null">
|
|
- AND OO.ORDER_TYPE =#{orderType}
|
|
|
|
|
|
+ AND OO.ORDER_TYPE in (#{orderType},11)
|
|
</if>
|
|
</if>
|
|
<if test="con!=null">
|
|
<if test="con!=null">
|
|
AND RC.CAPACITY_NUMBER LIKE #{con} or RM.MATERIAL_NAME LIKE #{con}
|
|
AND RC.CAPACITY_NUMBER LIKE #{con} or RM.MATERIAL_NAME LIKE #{con}
|