Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API

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

@@ -4515,7 +4515,7 @@
             ELSE null
             END) "planNum",--计划总数
         COUNT(DISTINCT CASE WHEN
-            ASO.SALE_TYPE = 1
+            ASO.SALE_TYPE = 1 AND OO .CAPACITY_ID !=35907 --空白不计入已派发运单
             THEN
             OO .ORDER_ID
             ELSE null
@@ -4742,7 +4742,7 @@
             or (NVL(ASOM.WARRANTY_NUMBER,0) = 1 and asom.PREVIOUS_ORDER_NUMBER is null))
         </if>
         GROUP BY ASM.TRANSFER_OUT_OF_WAREHOUSE
-        ) T4 ON T1 ."target" = T4."target" AND T1."carrierName" = 	T4."carrierName"
+        ) T4 ON T0 ."target" = T4."target" AND T0."carrierName" = 	T4."carrierName"
         LEFT JOIN
         (
         --查询车皮理重
@@ -4924,7 +4924,12 @@
         ASM .TRANSFER_OUT_OF_WAREHOUSE "target",--方向
         '本地自提' "carrierName",--承运商
         COUNT(DISTINCT ASOM.SALE_ORDER_MATERIAL_ID) "planNum",--计划总数
-        COUNT(DISTINCT OO .ORDER_ID) "orderNum",--运单总数
+        COUNT(DISTINCT CASE WHEN
+        ASO.SALE_TYPE = 1 AND OO .CAPACITY_ID !=35907 --空白不计入已派发运单
+        THEN
+        OO .ORDER_ID
+        ELSE null
+        END) "orderNum",--运单总数
         COUNT(DISTINCT OO_QUXIAO .ORDER_ID) "quxiaoNum",--取消运单数
         COUNT(DISTINCT OO_NOT_EN .ORDER_ID) "notEnNum",--未进场数量
         COUNT(DISTINCT OO_EN .ORDER_ID) "EnNum",--进场待装数量