|
|
@@ -883,7 +883,6 @@
|
|
|
LEFT JOIN AMS_SALE_ORDER ASO ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
|
|
|
LEFT JOIN RMS_CONSIGNEE RCE ON RCE.CONSIGNEE_ID = ASO.RECEIVE_ID
|
|
|
where oo.ORDER_STATUS = 5
|
|
|
- <where>
|
|
|
<if test="capacityNumber != null">
|
|
|
and instr(RC.CAPACITY_NUMBER, #{capacityNumber}) > 0
|
|
|
</if>
|
|
|
@@ -897,7 +896,6 @@
|
|
|
and QQL.GRID_ID = #{locationId}
|
|
|
ORDER BY QQL.ENTRY_SURE_TIME DESC, QQL.IS_VIP, "listNodeOrder"
|
|
|
</if>
|
|
|
- </where>
|
|
|
<if test="locationId == null">
|
|
|
ORDER BY QQL.ENTRY_SURE_TIME DESC, QQL.IS_VIP, "materialName" DESC, "listNodeOrder"
|
|
|
</if>
|
|
|
@@ -950,7 +948,6 @@
|
|
|
LEFT JOIN AMS_SALE_ORDER ASO ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
|
|
|
LEFT JOIN RMS_CONSIGNEE RCE ON RCE.CONSIGNEE_ID = ASO.RECEIVE_ID
|
|
|
where oo.ORDER_STATUS = 5
|
|
|
- <where>
|
|
|
<if test="capacityNumber != null">
|
|
|
and instr(RC.CAPACITY_NUMBER, #{capacityNumber}) > 0
|
|
|
</if>
|
|
|
@@ -969,10 +966,9 @@
|
|
|
and QQSL.SPELILING_NUM = #{locationId}
|
|
|
ORDER BY QQSL.ENTRY_SURE_TIME DESC, QQSL.IS_VIP, "listNodeOrder"
|
|
|
</if>
|
|
|
- </where>
|
|
|
- <if test="locationId == null">
|
|
|
- order by QQSL.ENTRY_SURE_TIME DESC, QQSL.IS_VIP, QQSL.SPELILING_NUM DESC, "listNodeOrder"
|
|
|
- </if>
|
|
|
+ <if test="locationId == null">
|
|
|
+ order by QQSL.ENTRY_SURE_TIME DESC, QQSL.IS_VIP, QQSL.SPELILING_NUM DESC, "listNodeOrder"
|
|
|
+ </if>
|
|
|
</select>
|
|
|
|
|
|
|
luobang