提交代码

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

@@ -854,7 +854,7 @@ public class StatisticalReportController extends BaseRESTfulController {
             String shippingAddressIds = (String) stringObjectMap.get("shippingAddressIds");
             String capacityNumbers= (String) stringObjectMap.get("capacityNumbers");
             //
-            String priceIds = (String) stringObjectMap.get("priceIds");
+            /*String priceIds = (String) stringObjectMap.get("priceIds");
             if (priceIds!=null&&!(priceIds.isEmpty())){
                 String[] split = priceIds.split(",");
                 int i=0;
@@ -867,7 +867,7 @@ public class StatisticalReportController extends BaseRESTfulController {
                         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

@@ -2226,20 +2226,7 @@
         "carrierName",
         OO.ORDER_NUMBER "orderNo",
         ACTP.PRICE_VALUE AS "priceValue",
-        case
-        when BDO.HISTORY_DETAILS_AMOUNT is not null
-        then BDO.HISTORY_DETAILS_AMOUNT
-        when BDO.HISTORY_DETAILS_AMOUNT is null
-        then BDO.DETAILS_AMOUNT
-        end
-        "detailsAmount",
-        case
-        when BDO.HISTORY_DETAILS_AMOUNT is not null
-        then BDO.DETAILS_AMOUNT
-        when BDO.HISTORY_DETAILS_AMOUNT is null
-        then null
-        end
-        "futureDetailsAmount",
+        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
@@ -2334,6 +2321,7 @@
         WHERE ASO.SALE_TYPE = 1
         AND ASO.DELETED = 0
         and ASM.SALE_MATERIAL_ID IS NOT NULL
+        and BDO.WETHER_TO_STATEMENT != 1
         <if test="oneDate != null">
             and to_date(#{oneDate}, 'yyyy-mm-dd') &lt; = to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
         </if>
@@ -2484,20 +2472,7 @@
         "carrierName",
         OO.ORDER_NUMBER "orderNo",
         ACTP.PRICE_VALUE AS "priceValue",
-        case
-        when BDO.HISTORY_DETAILS_AMOUNT is not null
-        then BDO.HISTORY_DETAILS_AMOUNT
-        when BDO.HISTORY_DETAILS_AMOUNT is null
-        then BDO.DETAILS_AMOUNT
-        end
-        "detailsAmount",
-        case
-        when BDO.HISTORY_DETAILS_AMOUNT is not null
-        then BDO.DETAILS_AMOUNT
-        when BDO.HISTORY_DETAILS_AMOUNT is null
-        then null
-        end
-        "futureDetailsAmount",
+        BDO.DETAILS_AMOUNT "detailsAmount",
         RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
         RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS AS "addressPlace",
         RRP.PLACE_ID "placeId",