|
|
@@ -479,6 +479,7 @@
|
|
|
RM.MATERIAL_NAME "materialName",
|
|
|
DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
|
|
|
WOR.RESULT_TONNAGE "resultTonnage",
|
|
|
+ TLT.RESULT_BILLABLE_TONNAGE "weight",
|
|
|
WOR.RESULT_CLEARING "resultClearing",
|
|
|
WOR.INSERT_TIME "insertTime"
|
|
|
from TMSTRAIN_LOADING_TEMP TLT
|
|
|
@@ -492,8 +493,11 @@
|
|
|
on RM.MATERIAL_ID = DB.MATERIAL_ID
|
|
|
left join RMS_PORT RP
|
|
|
on RP.PORT_ID = WOR.HARBOR_ID
|
|
|
- where (instr(RM.MATERIAL_NAME , #{con}) > 0 or instr( TLT.RESULT_WAGON_NO, #{con}) > 0 or
|
|
|
+ where RP.PORT_NAME='万州港'
|
|
|
+ <if test="con!=null">
|
|
|
+ and (instr(RM.MATERIAL_NAME , #{con}) > 0 or instr( TLT.RESULT_WAGON_NO, #{con}) > 0 or
|
|
|
instr(DB.RESULT_FOREIGN_SHIP_NAME,#{con}) > 0 or instr( RP.PORT_NAME,#{con}) > 0)
|
|
|
+ </if>
|
|
|
Order By WOR.RESULT_NUMBER desc
|
|
|
</select>
|
|
|
</mapper>
|
zx