提交代码

src/main/java/com/steerinfo/dil/controller/StatisticalReportController.java

@@ -978,21 +978,6 @@ public class StatisticalReportController extends BaseRESTfulController {
         for (Map<String, Object> stringObjectMap : report) {
             String shippingAddressIds = (String) stringObjectMap.get("shippingAddressIds");
             String capacityNumbers= (String) stringObjectMap.get("capacityNumbers");
-            //
-            String priceIds = (String) stringObjectMap.get("priceIds");
-            if (priceIds!=null&&!(priceIds.isEmpty())){
-                String[] split = priceIds.split(",");
-                int i=0;
-                for (String s : split) {
-                    i++;
-                    if (i==1){
-                        stringObjectMap.put("priceValue",statisticalReportService.getHistoryPrice(DataChange.dataToBigDecimal(s)));
-                    }
-                    if (i==2){
-                        stringObjectMap.put("futurePriceValue",statisticalReportService.getHistoryPrice(DataChange.dataToBigDecimal(s)));
-                    }
-                }
-            }
             //确认是否有多个收货单位
             if (shippingAddressIds !=null && !("".equals(shippingAddressIds))){
                 String[] split = shippingAddressIds.split(",");

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

@@ -2243,8 +2243,15 @@
         RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
         RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS
         end  "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",
         RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
-        RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS AS "actualAddress",
+        RRA.ADDRESS_TOWN AS "actualCity",
         RRP.PLACE_ID "placeId",
         RRP.ADDRESS_DELIVERY_ADDRESS "place",
         RRA.ADDRESS_ID "shipperAddressId",
@@ -2273,7 +2280,19 @@
         TRR.INSERT_TIME "receiptTime",
         ASO.sale_remark "saleRemark",
         DECODE(OO.PRINTNUMBER,1,'已打印','未打印') "isPrintDelivery",
-        BDO.PRICEIDS "priceIds"
+        BDO.PRICEIDS "priceIds",
+        --理重
+        ASM.MATERIAL_WEIGHT "materialWeight",
+        --收款客户
+        ASO.SALE_ORDER_RECEIVE_CUSTOMER "saleOrderReceiveCustomer",
+        --结算方式
+        RC.CONSIGNEE_SETTLEMENT_METHOD "consingneeSettlementMethod",
+        --付款客户
+        ASO.SALE_ORDER_RECEIVE_CUSTOMER "paymentCustomer",
+        --卸货类别
+        RRP.UNLOAD_TYPE "unloadType",
+        --计划件数
+        ASM.MATERIAL_PLAN_NUMBER "materialPlanNumber"
         FROM AMS_SALE_ORDER ASO
         LEFT JOIN RMS_CONSIGNEE RC
         ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
@@ -2476,8 +2495,28 @@
         OO.ORDER_NUMBER "orderNo",
         ACTP.PRICE_VALUE AS "priceValue",
         BDO.DETAILS_AMOUNT "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 AS "addressPlace",
+        RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS
+        end  "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",
+        RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
+        RRA.ADDRESS_TOWN AS "actualCity",
         RRP.PLACE_ID "placeId",
         RRP.ADDRESS_DELIVERY_ADDRESS "place",
         RRA.ADDRESS_ID "shipperAddressId",
@@ -2506,7 +2545,19 @@
         TRR.INSERT_TIME "receiptTime",
         ASO.sale_remark "saleRemark",
         DECODE(OO.PRINTNUMBER,1,'已打印','未打印') "isPrintDelivery",
-        BDO.PRICEIDS "priceIds"
+        BDO.PRICEIDS "priceIds",
+        --理重
+        ASM.MATERIAL_WEIGHT "materialWeight",
+        --收款客户
+        ASO.SALE_ORDER_RECEIVE_CUSTOMER "saleOrderReceiveCustomer",
+        --付款客户
+        ASO.SALE_ORDER_RECEIVE_CUSTOMER "paymentCustomer",
+        --结算方式
+        RC.CONSIGNEE_SETTLEMENT_METHOD "consingneeSettlementMethod",
+        --卸货类别
+        RRP.UNLOAD_TYPE "unloadType",
+        --计划件数
+        ASM.MATERIAL_PLAN_NUMBER "materialPlanNumber"
         FROM AMS_SALE_ORDER ASO
         LEFT JOIN RMS_CONSIGNEE RC
         ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
@@ -2547,7 +2598,7 @@
         LEFT JOIN BMSTRUCK_DETAILS_ORDER BDO
         ON BDO.WEIGHT_TASK_RESULT_ID = TWR.WEIGHT_TASK_RESULT_ID
         LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE actp
-        ON actp.PRICE_ID = bdo.PRICE_ID
+        ON actp.PRICE_ID = oo.PRICE_ID
         LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
         ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         LEFT JOIN TMSTRUCK_ARRIVAL_RESULT TAR