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

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

@@ -2085,9 +2085,9 @@
                         end)      "isContinue",
                     aso.BUSINESS_DATE           "insertUploadTime",
                     (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
+                    ASM.IS_POUND_SALE = 0 AND TWB.BATCH_NET_WEIGHT IS NOT NULL
+                    THEN TWB.BATCH_NET_WEIGHT
+                    WHEN ASM.IS_POUND_SALE = 1 AND TWB.BATCH_NET_WEIGHT IS NOT NULL
                     THEN ASM.MATERIAL_WEIGHT
                     ELSE ASM.MATERIAL_WEIGHT
                     END) "materialThoWeight",