|
|
@@ -4666,6 +4666,7 @@
|
|
|
<if test="model != null">
|
|
|
AND RM.MATERIAL_MODEL = #{model}
|
|
|
</if>
|
|
|
+ fetch next 1 rows only
|
|
|
</select>
|
|
|
|
|
|
<select id="findAddressId" parameterType="java.util.Map" resultType="DECIMAL" >
|
|
|
@@ -4950,7 +4951,7 @@
|
|
|
AND TWB.BATCH_NET_WEIGHT IS NOT NULL
|
|
|
AND TWB.BATCH_GROSS_WEIGHT_TIME IS NOT NULL
|
|
|
AND ASM.EAS_PRIMARY_ID IS NOT NULL
|
|
|
- AND OO.ORDER_TYPE = 1
|
|
|
+ AND OO.ORDER_TYPE in (1,4)
|
|
|
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=")">
|
luobang