|
@@ -788,9 +788,12 @@
|
|
|
LEFT JOIN RMS_CAPACITY_TYPE RCT
|
|
|
ON RCT.CAPACITY_TYPE_ID=AIR.CAPACITY_TYPE_ID
|
|
|
where TTTR.RESULT_TIME_TYPE = 3 AND TTTR.RESULT_VALUE IS NOT NULL
|
|
|
- <if test="orderType!=null">
|
|
|
+ <if test="orderType!=null and orderType != 26">
|
|
|
AND OO.ORDER_TYPE in (#{orderType},11)
|
|
|
</if>
|
|
|
+ <if test="orderType!=null and orderType == 26">
|
|
|
+ AND OO.ORDER_TYPE = #{orderType}
|
|
|
+ </if>
|
|
|
<if test="con!=null and con != ''">
|
|
|
AND RC.CAPACITY_NUMBER || RM.MATERIAL_NAME || RS.SHIPPER_NAME LIKE CONCAT('%',CONCAT(#{con},'%'))
|
|
|
</if>
|