|
|
@@ -2270,7 +2270,11 @@
|
|
|
END)
|
|
|
"carrierName",
|
|
|
OO.ORDER_NUMBER "orderNo",
|
|
|
- TO_CHAR(ACTP.PRICE_VALUE,'9999999990.99') AS "priceValue",
|
|
|
+ (CASE
|
|
|
+ WHEN ACTP.PRICE_VALUE IS NOT NULL
|
|
|
+ THEN TO_CHAR(ACTP.PRICE_VALUE,'9999999990.99')
|
|
|
+ ELSE TO_CHAR(ACTP2.PRICE_VALUE,'9999999990.99')
|
|
|
+ END) AS "priceValue",
|
|
|
TO_CHAR(BDO.DETAILS_AMOUNT,'9999999990.99') "detailsAmount",
|
|
|
case
|
|
|
when nvl(ASOM.HISTORY_SHIPPING_ADDRESS_ID,0) !=0
|
|
|
@@ -2380,6 +2384,8 @@
|
|
|
ON BDO.WEIGHT_TASK_RESULT_ID = TWR.WEIGHT_TASK_RESULT_ID
|
|
|
LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE actp
|
|
|
ON actp.PRICE_ID = OO.PRICE_ID
|
|
|
+ LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE actp2
|
|
|
+ ON actp2.PRICE_ID = ASOM.PRICE_ID
|
|
|
LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
|
|
|
ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
|
|
|
LEFT JOIN TMSTRUCK_ARRIVAL_RESULT TAR
|
luobang