|
@@ -440,6 +440,14 @@
|
|
|
<if test="receivName != null and receivName != ''">
|
|
|
and RCON.CONSIGNEE_COMPANY_NAME like Concat('%',Concat(#{receivName},'%'))
|
|
|
</if>
|
|
|
+ <if test="remarkNo != null and remarkNo != '' and remarkNo !='null' ">
|
|
|
+ and RCON.CONSIGNEE_COMPANY_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL || RC2.CARRIER_NAME
|
|
|
+ || RC.CAPACITY_NUMBER like Concat('%',Concat(#{remarkNo},'%'))
|
|
|
+ </if>
|
|
|
+ <if test="remarkNo2 != null and remarkNo2 != '' and remarkNo2 !='null'">
|
|
|
+ and RCON.CONSIGNEE_COMPANY_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL || RC2.CARRIER_NAME
|
|
|
+ || RC.CAPACITY_NUMBER like Concat('%',Concat(#{remarkNo2},'%'))
|
|
|
+ </if>
|
|
|
<if test="oneDate != null and orderTypee == 1">
|
|
|
and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') <= TER.RESULT_ENTRY_GATE_TIME
|
|
|
</if>
|