|
@@ -819,7 +819,8 @@
|
|
|
AIR.INSERT_UPDATE_REMARK "Tel",
|
|
|
RMT.MATERIAL_TYPE_NAME "materialTypeName",
|
|
|
RS.SHIPPER_NAME || RM.MATERIAL_NAME || rw2.warehouse_name || rw1.warehouse_name || RMT.MATERIAL_TYPE_NAME "likeIndex",
|
|
|
- r_c_type.capacity_type_name "capacityTypeName"
|
|
|
+ r_c_type.capacity_type_name "capacityTypeName",
|
|
|
+ actp.price_value "priceValue"
|
|
|
FROM
|
|
|
AMSTRUCK_INWARD_REQUIREMENT AIR
|
|
|
LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
|
|
@@ -831,9 +832,11 @@
|
|
|
LEFT JOIN RMS_TRANS_RANGE RTR ON RTR.TRANS_RANGE_ID = AIR.LINE_ID
|
|
|
LEFT JOIN RMS_MATERIAL_TYPE RMT ON RMT.MATERIAL_TYPE_ID = RM.MATERIAL_TYPE_ID
|
|
|
LEFT JOIN RMS_CAPACITY_TYPE r_c_type ON air.capacity_type_id = r_c_type.CAPACITY_TYPE_ID
|
|
|
+ left join ams_contract_transport_price actp on actp.capacity_type_id = r_c_type.capacity_type_id
|
|
|
WHERE
|
|
|
AIR.DELETED = 0
|
|
|
AND AIR.PURCHASE_ORDER_ID IS NULL
|
|
|
+ AND nvl(ACTP.DELETED,0) = 0
|
|
|
<if test="con !=null ">
|
|
|
AND AIR.INSERT_USERNAME LIKE #{con}
|
|
|
</if>
|