|
|
@@ -3359,8 +3359,6 @@
|
|
|
LEFT JOIN RMS_RECEIVE_PLACE RRP ON RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
|
|
|
LEFT JOIN RMS_RECEIVE_ADDRESS RDA ON RDA.ADDRESS_ID = RRP.ADDRESS_ID
|
|
|
WHERE
|
|
|
- ASO.DELETED = 0
|
|
|
- and
|
|
|
OO.ORDER_ID = #{orderId}
|
|
|
AND rownum =1
|
|
|
<if test="status == null">
|
|
|
@@ -3982,8 +3980,7 @@
|
|
|
RM.MATERIAL_ID||'' in (select SPECTIONS_MODEL from QMS_MODEL_UNROOLED)
|
|
|
) TEMP ON TEMP."orderId"=OO.ORDER_ID
|
|
|
WHERE
|
|
|
- ASO.DELETED = 0
|
|
|
- AND OO.ORDER_ID = #{orderId}
|
|
|
+ OO.ORDER_ID = #{orderId}
|
|
|
AND rownum =1
|
|
|
<if test="status == null">
|
|
|
AND OO.ORDER_STATUS between 4 and 6
|
