|
@@ -988,6 +988,8 @@
|
|
|
WHERE RRA.ADDRESS_PROVINCE ||
|
|
WHERE RRA.ADDRESS_PROVINCE ||
|
|
|
RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN ||
|
|
RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN ||
|
|
|
RRP.ADDRESS_DELIVERY_ADDRESS like #{con}
|
|
RRP.ADDRESS_DELIVERY_ADDRESS like #{con}
|
|
|
|
|
+ AND RRP.PLACE_ID IN (select ACTP.PLACE_ID FROM AMS_CONTRACT_TRANSPORT_PRICE ACTP
|
|
|
|
|
+ WHERE ACTP.DELETED=0)
|
|
|
</select>
|
|
</select>
|
|
|
|
|
|
|
|
<!--获取全部承运商的信息-->
|
|
<!--获取全部承运商的信息-->
|
|
@@ -1276,7 +1278,7 @@
|
|
|
on rs.SHIPPER_ID = a_t_price.SHIPPER_ID
|
|
on rs.SHIPPER_ID = a_t_price.SHIPPER_ID
|
|
|
<where>
|
|
<where>
|
|
|
TYPE=1
|
|
TYPE=1
|
|
|
- --and a_t_price.ISSTANDARD is null
|
|
|
|
|
|
|
+ and a_t_price.ISSTANDARD is null
|
|
|
--and a_t_price.DELETED = 0
|
|
--and a_t_price.DELETED = 0
|
|
|
<if test="carrierName1!=null and carrierName1 != ''.toString() ">
|
|
<if test="carrierName1!=null and carrierName1 != ''.toString() ">
|
|
|
and (r_carrier.CARRIER_NAME like CONCAT('%',CONCAT(#{carrierName1},'%'))
|
|
and (r_carrier.CARRIER_NAME like CONCAT('%',CONCAT(#{carrierName1},'%'))
|
zengyf