|
@@ -1739,6 +1739,8 @@
|
|
|
ON ARC.TRANS_REQUIREMENT_ID = ATR.TRANS_REQUIREMENT_ID
|
|
ON ARC.TRANS_REQUIREMENT_ID = ATR.TRANS_REQUIREMENT_ID
|
|
|
LEFT JOIN RMS_MATERIAL RM
|
|
LEFT JOIN RMS_MATERIAL RM
|
|
|
ON RM.MATERIAL_ID = ARC.MATERIAL_ID
|
|
ON RM.MATERIAL_ID = ARC.MATERIAL_ID
|
|
|
|
|
+ LEFT JOIN RMS_COMPANY RC
|
|
|
|
|
+ ON RC.COMPANY_ID = ATR.RECEIVING_COMPANY_ID
|
|
|
<where>
|
|
<where>
|
|
|
ATR.DELETED NOT IN (2,5,6)
|
|
ATR.DELETED NOT IN (2,5,6)
|
|
|
<if test="index != null and index != ''">
|
|
<if test="index != null and index != ''">
|
|
@@ -1753,6 +1755,9 @@
|
|
|
<if test="materialId !=null and materialId != ''">
|
|
<if test="materialId !=null and materialId != ''">
|
|
|
AND REGEXP_LIKE(ARC.MATERIAL_ID, #{materialId})
|
|
AND REGEXP_LIKE(ARC.MATERIAL_ID, #{materialId})
|
|
|
</if>
|
|
</if>
|
|
|
|
|
+ <if test="receiveCompanyName !=null and receiveCompanyName != ''">
|
|
|
|
|
+ AND REGEXP_LIKE(RC.COMPANY_NAME, #{receiveCompanyName})
|
|
|
|
|
+ </if>
|
|
|
</where>
|
|
</where>
|
|
|
FETCH NEXT 10 ROWS ONLY
|
|
FETCH NEXT 10 ROWS ONLY
|
|
|
)
|
|
)
|