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

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

@@ -3701,11 +3701,44 @@
         RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "materialSpe",
         RM.MATERIAL_SPECIFICATION   "materialSpecification",
         RM.MATERIAL_MODEL   "materialModel",
-        TWR.RESULT_GROSS_WEIGHT "grossWeight",
-        TWR.RESULT_GROSS_WEIGHT_TIME "grossWeightTime",
-        TWR.RESULT_TARE_WEIGHT       "tareWeight",
-        TWR.RESULT_TARE_WEIGHT_TIME  "tareWeightTime",
-        TWR.RESULT_NET_WEIGHT        "netWeight",
+
+        TWB .WEIGHT_BATCH_ID "weightBatchId",
+        (
+            CASE
+                WHEN TWB.WEIGHT_BATCH_ID IS NOT NULL
+                    THEN TWB.BATCH_GROSS_WEIGHT
+                ELSE TWR.RESULT_GROSS_WEIGHT
+                END
+            ) "grossWeight",
+        (
+            CASE
+                WHEN TWB.WEIGHT_BATCH_ID IS NOT NULL
+                    THEN TWB.BATCH_GROSS_WEIGHT_TIME
+                ELSE TWR.RESULT_GROSS_WEIGHT_TIME
+                END
+            ) "grossWeightTime",
+        (
+            CASE
+                WHEN TWB.WEIGHT_BATCH_ID IS NOT NULL
+                    THEN TWB.BATCH_TARE_WEIGHT
+                ELSE TWR.RESULT_TARE_WEIGHT
+                END
+            ) "tareWeight",
+        (
+            CASE
+                WHEN TWB.WEIGHT_BATCH_ID IS NOT NULL
+                    THEN TWB.BATCH_TARE_WEIGHT_TIME
+                ELSE TWR.RESULT_TARE_WEIGHT_TIME
+                END
+            ) "tareWeightTime",
+        (
+            CASE
+                WHEN TWB.WEIGHT_BATCH_ID IS NOT NULL
+                    THEN TWB.BATCH_NET_WEIGHT
+                ELSE TWR.RESULT_NET_WEIGHT
+                END
+            ) "netWeight",
+
         TLR.RESULT_LOAD_END_TIME     "loadTime",
         BDO.DETAILS_AMOUNT           "detailsAmount",
         oo.ORDER_NUMBER             "orderNo"
@@ -3735,6 +3768,8 @@
         LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
         ON TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         AND TLR.MATERIAL_ID = RM.MATERIAL_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_BATCH TWB
+        ON TWB .WEIGHT_BATCH_ID = ASM .WEIGHT_BATCH_ID
         WHERE ASO.SALE_TYPE = 1
         and ASM.SALE_MATERIAL_ID IS NOT NULL
         AND ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
@@ -4751,7 +4786,7 @@
         RC.CARRIER_ABBREVIATION
         end "carrierName",--承运商
         SUM(CASE WHEN
-            ASO.SALE_TYPE = 1
+            ASO.SALE_TYPE = 1 AND ASM .WEIGHT_BATCH_ID IS NULL
             THEN
             TWR.RESULT_NET_WEIGHT
             ELSE 0