|
@@ -1519,7 +1519,7 @@
|
|
AND ARM.MATERIAL_LUNO IS NOT NULL
|
|
AND ARM.MATERIAL_LUNO IS NOT NULL
|
|
AND OO.ORDER_STATUS IN (2,4,5)
|
|
AND OO.ORDER_STATUS IN (2,4,5)
|
|
AND OO.ORDER_TYPE = 11
|
|
AND OO.ORDER_TYPE = 11
|
|
- <if test="oneDate != null">
|
|
|
|
|
|
+ <if test="oneDate != null and queryHeatNo == null">
|
|
and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') <= AIR.INSERT_TIME
|
|
and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') <= AIR.INSERT_TIME
|
|
</if>
|
|
</if>
|
|
<if test="startDate != null">
|
|
<if test="startDate != null">
|
|
@@ -1532,6 +1532,9 @@
|
|
<if test="clazz != null">
|
|
<if test="clazz != null">
|
|
and AIR.REQUIREMENT_CLASS like #{clazz}
|
|
and AIR.REQUIREMENT_CLASS like #{clazz}
|
|
</if>
|
|
</if>
|
|
|
|
+ <if test="queryHeatNo != null">
|
|
|
|
+ and ARM.MATERIAL_LUNO like #{queryHeatNo}
|
|
|
|
+ </if>
|
|
Order by air.insert_time desc
|
|
Order by air.insert_time desc
|
|
)
|
|
)
|
|
</select>
|
|
</select>
|