|
|
@@ -2143,7 +2143,10 @@
|
|
|
and R_CARRIER.CARRIER_SSO_ID = #{carrierSsoId}
|
|
|
</if>
|
|
|
<if test="remark != null" >
|
|
|
- and (CASE WHEN RRA_HISTORY.ADDRESS_PROVINCE is not null
|
|
|
+ and RSR.SALER_NAME || RCA.CAPACITY_NUMBER ||
|
|
|
+ RC.CONSIGNEE_COMPANY_NAME || R_CARRIER.CARRIER_ABBREVIATION ||
|
|
|
+ RM.MATERIAL_NAME || RM.MATERIAL_MODEL ||
|
|
|
+ RM.MATERIAL_SPECIFICATION || (CASE WHEN RRA_HISTORY.ADDRESS_PROVINCE is not null
|
|
|
THEN '新地址：' || RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
|
|
|
RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS
|
|
|
|| '；旧地址：' || RRA_HISTORY.ADDRESS_PROVINCE || RRA_HISTORY.ADDRESS_DISTRICT ||
|
|
|
@@ -2153,6 +2156,17 @@
|
|
|
RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS
|
|
|
END) LIKE #{remark}
|
|
|
</if>
|
|
|
+ <if test="receiveAddress != null" >
|
|
|
+ and (CASE WHEN RRA_HISTORY.ADDRESS_PROVINCE is not null
|
|
|
+ THEN '新地址：' || RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
|
|
|
+ RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS
|
|
|
+ || '；旧地址：' || RRA_HISTORY.ADDRESS_PROVINCE || RRA_HISTORY.ADDRESS_DISTRICT ||
|
|
|
+ RRA_HISTORY.ADDRESS_TOWN || RRP_HISTORY.ADDRESS_DELIVERY_ADDRESS
|
|
|
+ ELSE
|
|
|
+ RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
|
|
|
+ RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS
|
|
|
+ END) LIKE '%${receiveAddress}%'
|
|
|
+ </if>
|
|
|
<if test="easPrimaryId != null">
|
|
|
and ASM.EAS_PRIMARY_ID = #{easPrimaryId}
|
|
|
</if>
|
luobang