|
@@ -4681,6 +4681,7 @@
|
|
|
AND TWR.RESULT_NET_WEIGHT IS NOT NULL
|
|
|
AND ASM.EAS_PRIMARY_ID IS NOT NULL
|
|
|
AND OO.ORDER_TYPE = 1
|
|
|
+ AND OO.ORDER_STATUS IN (2,5)
|
|
|
<if test="easPrimaryList != null and easPrimaryList.size > 0">
|
|
|
and <foreach collection="easPrimaryList" item="item" open="(" separator="or" close=")">
|
|
|
ASM.EAS_PRIMARY_ID LIKE '%${item}%'
|
|
@@ -4689,9 +4690,9 @@
|
|
|
<if test="easPrimaryList == null">
|
|
|
and ASM.SALE_MAKE_DATE IS NULL
|
|
|
AND ASOM.SALE_DATE_OF_RECEIPT < sysdate
|
|
|
- AND ASOM.SALE_DATE_OF_RECEIPT > sysdate -20
|
|
|
+ AND ASOM.SALE_DATE_OF_RECEIPT > sysdate - 2
|
|
|
ORDER BY OO.ORDER_ID
|
|
|
- FETCH NEXT 50 ROWS ONLY
|
|
|
+ FETCH NEXT 50000 ROWS ONLY
|
|
|
</if>
|
|
|
</select>
|
|
|
<select id="getNextCarrier" resultType="java.util.Map" parameterType="java.lang.Integer">
|