|
|
@@ -2240,8 +2240,21 @@
|
|
|
then null
|
|
|
end
|
|
|
"futureDetailsAmount",
|
|
|
+ case
|
|
|
+ when nvl(ASOM.HISTORY_SHIPPING_ADDRESS_ID,0) !=0
|
|
|
+ then (select RRA.ADDRESS_PROVINCE||RRA.ADDRESS_DISTRICT||RRA.ADDRESS_TOWN
|
|
|
+ ||RRP.ADDRESS_DELIVERY_ADDRESS "realAddress"
|
|
|
+ from RMS_RECEIVE_PLACE RRP
|
|
|
+ LEFT JOIN RMS_RECEIVE_ADDRESS RRA
|
|
|
+ ON RRA.ADDRESS_ID=RRP.ADDRESS_ID
|
|
|
+ WHERE RRP.PLACE_ID=ASOM.HISTORY_SHIPPING_ADDRESS_ID)
|
|
|
+ when nvl(ASOM.HISTORY_SHIPPING_ADDRESS_ID,0) =0
|
|
|
+ then
|
|
|
RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
|
|
|
- RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS AS "addressPlace",
|
|
|
+ RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS
|
|
|
+ end "addressPlace",
|
|
|
+ RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
|
|
|
+ RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS AS "actualAddress",
|
|
|
RRP.PLACE_ID "placeId",
|
|
|
RRP.ADDRESS_DELIVERY_ADDRESS "place",
|
|
|
RRA.ADDRESS_ID "shipperAddressId",
|
zengyf