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

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

@@ -4745,8 +4745,10 @@
         SELECT
         ASM .TRANSFER_OUT_OF_WAREHOUSE "target",--方向
         '车皮' "carrierName",--承运商
-        SUM( CASE WHEN
-        TWR.RESULT_NET_WEIGHT IS NOT NULL
+        SUM( CASE
+        WHEN TWR.RESULT_NET_WEIGHT IS NOT NULL AND regexp_like(RM .MATERIAL_NAME,'盘螺|乱尺|盘元|盘圆')
+        THEN TWR.RESULT_NET_WEIGHT
+        WHEN TWR.RESULT_NET_WEIGHT IS NOT NULL
         THEN ASM.MATERIAL_WEIGHT
         ELSE 0
         END) "trainThoWeight"
@@ -4761,6 +4763,8 @@
         ON OO.ORDER_PLAN_ID=ASOM.SALE_ORDER_MATERIAL_ID
         LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
         ON TWR.SALE_MATERIAL_ID = ASM.SALE_MATERIAL_iD
+        LEFT JOIN RMS_MATERIAL RM
+        ON ASM .MATERIAL_ID = RM .MATERIAL_ID
         WHERE
         NVL(aso.DELETED,0) in (0,2)
         AND aso.SALE_ORDER_STATUS = 4
@@ -4797,7 +4801,7 @@
         SUM(CASE WHEN
         ASM.IS_POUND_SALE = 0 AND TWR.RESULT_NET_WEIGHT IS NOT NULL
         THEN TWR.RESULT_NET_WEIGHT
-        WHEN ASM.IS_POUND_SALE = 1 AND TWR.RESULT_NET_WEIGHT IS NOT NULL
+        WHEN ASM.IS_POUND_SALE = 1 AND ASM.WEIGHT_BATCH_ID IS NOT NULL
         THEN ASM.MATERIAL_WEIGHT
         END) "truckThoWeight",
         SUM(CASE WHEN
@@ -4887,7 +4891,7 @@
             </if>
         )
         GROUP BY "carrierName","target"
-        ) T7 ON T1 ."target" = T7."target" AND T1."carrierName" = 	T7."carrierName"
+        ) T7 ON T0 ."target" = T7."target" AND T0."carrierName" = 	T7."carrierName"
 
         UNION
 
@@ -5114,7 +5118,7 @@
         SUM(CASE WHEN
         ASM.IS_POUND_SALE = 0 AND TWR.RESULT_NET_WEIGHT IS NOT NULL
         THEN TWR.RESULT_NET_WEIGHT
-        WHEN ASM.IS_POUND_SALE = 1 AND TWR.RESULT_NET_WEIGHT IS NOT NULL
+        WHEN ASM.IS_POUND_SALE = 1 AND  ASM.WEIGHT_BATCH_ID IS NOT NULL
         THEN ASM.MATERIAL_WEIGHT
         END) "truckThoWeight",
         SUM(CASE WHEN