|
@@ -2216,7 +2216,7 @@
|
|
</if>
|
|
</if>
|
|
<if test="saleAreaRemark != null">
|
|
<if test="saleAreaRemark != null">
|
|
and <foreach collection="saleAreaRemark" item="item" open="(" separator="or" close=")">
|
|
and <foreach collection="saleAreaRemark" item="item" open="(" separator="or" close=")">
|
|
- ASO.sale_remark like '%${item}%'
|
|
|
|
|
|
+ (CASE WHEN ASM.TRANSFER_IN_OF_WAREHOUSE IS NOT NULL THEN ASM.TRANSFER_IN_OF_WAREHOUSE ELSE ASO.SALE_REMARK END) like '%${item}%'
|
|
</foreach>
|
|
</foreach>
|
|
</if>
|
|
</if>
|
|
<if test="consigneeNames != null">
|
|
<if test="consigneeNames != null">
|
|
@@ -2350,7 +2350,7 @@
|
|
</if>
|
|
</if>
|
|
<if test="saleRemarkList != null and saleRemarkList.size > 0">
|
|
<if test="saleRemarkList != null and saleRemarkList.size > 0">
|
|
and <foreach collection="saleRemarkList" item="item" open="(" separator="or" close=")">
|
|
and <foreach collection="saleRemarkList" item="item" open="(" separator="or" close=")">
|
|
- ASO.sale_remark like '%${item}%'
|
|
|
|
|
|
+ (CASE WHEN ASM.TRANSFER_IN_OF_WAREHOUSE IS NOT NULL THEN ASM.TRANSFER_IN_OF_WAREHOUSE ELSE ASO.SALE_REMARK END) like '%${item}%'
|
|
</foreach>
|
|
</foreach>
|
|
</if>
|
|
</if>
|
|
<if test="truckRemarkList != null and truckRemarkList.size > 0">
|
|
<if test="truckRemarkList != null and truckRemarkList.size > 0">
|