|
@@ -2411,7 +2411,8 @@
|
|
|
</foreach>
|
|
|
</if>
|
|
|
<if test="consigneeLoginName != null">
|
|
|
- and RC.CONSIGNEE_COMPANY_NAME LIKE '%${consigneeLoginName}%'
|
|
|
+ and (RC.CONSIGNEE_COMPANY_NAME LIKE '%${consigneeLoginName}%'
|
|
|
+ or ASO.SALE_ORDER_RECEIVE_CUSTOMER LIKE '%${consigneeLoginName}%')
|
|
|
</if>
|
|
|
and (aso.DELETED between 1 and 2 and aso.SALE_ORDER_STATUS = 4 or aso.DELETED = 0 and aso.SALE_ORDER_STATUS between 0 and 4)
|
|
|
and ASO.SALE_TYPE = 1
|