修改

src/main/resources/com/steerinfo/dil/mapper/StatisticalReportMapper.xml

@@ -2276,26 +2276,12 @@
             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
-        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
-        end  "addressPlace",
+          "addressPlace",
         --卸货城市
-        case
-        when nvl(ASOM.HISTORY_SHIPPING_ADDRESS_ID,0)=0
-        THEN NULL
-        WHEN NVL(ASOM.HISTORY_SHIPPING_ADDRESS_ID,0)!=0
-        THEN RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
-        RRA.ADDRESS_TOWN|| RRP.ADDRESS_DELIVERY_ADDRESS end "actualAddress",
+        RRA3.ADDRESS_PROVINCE || RRA3.ADDRESS_DISTRICT ||
+        RRA3.ADDRESS_TOWN|| RRP3.ADDRESS_DELIVERY_ADDRESS "actualAddress",
         RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
         RRA.ADDRESS_TOWN AS "actualCity",
         RRP.PLACE_ID "placeId",
@@ -2358,6 +2344,10 @@
         ON RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
         LEFT JOIN RMS_RECEIVE_ADDRESS RRA
         ON RRA.ADDRESS_ID = RRP.ADDRESS_ID
+        LEFT JOIN RMS_RECEIVE_PLACE RRP3
+        ON ASOM.ACTUALLY_ADDRESS_ID = RRP3.PLACE_ID
+        LEFT JOIN RMS_RECEIVE_ADDRESS RRA3
+        ON RRA3.ADDRESS_ID = RRP3.ADDRESS_ID
         LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
         ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
         LEFT JOIN RMS_CARRIER R_CARRIER
@@ -2561,26 +2551,12 @@
         OO.ORDER_NUMBER "orderNo",
         TO_CHAR(ACTP.PRICE_VALUE,'9999999990.99') AS "priceValue",
         TO_CHAR(BDO.DETAILS_AMOUNT,'9999999990.99') "detailsAmount",
-        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
-        end  "addressPlace",
+        "addressPlace",
         --卸货城市
-        case
-        when nvl(ASOM.HISTORY_SHIPPING_ADDRESS_ID,0)=0
-        THEN NULL
-        WHEN NVL(ASOM.HISTORY_SHIPPING_ADDRESS_ID,0)!=0
-        THEN RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
-        RRA.ADDRESS_TOWN|| RRP.ADDRESS_DELIVERY_ADDRESS end "actualAddress",
+        RRA3.ADDRESS_PROVINCE || RRA3.ADDRESS_DISTRICT ||
+        RRA3.ADDRESS_TOWN|| RRP3.ADDRESS_DELIVERY_ADDRESS  "actualAddress",
         RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
         RRA.ADDRESS_TOWN AS "actualCity",
         RRP.PLACE_ID "placeId",
@@ -2643,6 +2619,10 @@
         ON RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
         LEFT JOIN RMS_RECEIVE_ADDRESS RRA
         ON RRA.ADDRESS_ID = RRP.ADDRESS_ID
+        LEFT JOIN RMS_RECEIVE_PLACE RRP3
+        ON ASOM.ACTUALLY_ADDRESS_ID = RRP3.PLACE_ID
+        LEFT JOIN RMS_RECEIVE_ADDRESS RRA3
+        ON RRA3.ADDRESS_ID = RRP3.ADDRESS_ID
         LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
         ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
         LEFT JOIN RMS_CARRIER R_CARRIER