|
|
@@ -5601,9 +5601,9 @@
|
|
|
LEFT JOIN RMS_GATEPOST RGEN ON RGEN.GATEPOST_ID = TER.GATEPOST_ID
|
|
|
LEFT JOIN RMS_GATEPOST RGOUT ON RGOUT.GATEPOST_ID = TLFR.GATEPOST_ID
|
|
|
LEFT JOIN RMS_CAPACITY RC ON RC.CAPACITY_ID = OO.CAPACITY_ID
|
|
|
- WHERE OO.ORDER_TYPE = #{orderTypee}
|
|
|
+ WHERE NVL(OO.ORDER_TYPE,0) = (0,#{orderTypee})
|
|
|
AND ASO.SHIPPER_ID = #{shipperId}
|
|
|
- AND OO.ORDER_STATUS IN (2,4,5)
|
|
|
+ AND NVL(OO.ORDER_STATUS,0) IN (0,2,4,5)
|
|
|
<if test="orderTypee!=null and orderTypee==1">
|
|
|
AND ASM.MATERIAL_NUMBER IS NOT NULL
|
|
|
</if>
|
Redeem