liyg 1 rok temu
rodzic
commit
92bb758135

+ 8 - 4
src/main/resources/com/steerinfo/dil/mapper/StatisticalReportMapper.xml

@@ -4799,8 +4799,8 @@
             ELSE 0
             END) "truckNetWeight",
         SUM(CASE WHEN
-        ASM.IS_POUND_SALE = 0 AND TWR.RESULT_NET_WEIGHT IS NOT NULL
-        THEN TWR.RESULT_NET_WEIGHT
+        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 ASM.WEIGHT_BATCH_ID IS NOT NULL
         THEN ASM.MATERIAL_WEIGHT
         END) "truckThoWeight",
@@ -4824,6 +4824,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 TMSTRUCK_WEIGHT_BATCH TWB
+        ON TWB .WEIGHT_BATCH_ID = ASM .WEIGHT_BATCH_ID
         WHERE
         nvl(aso.DELETED,0) in (0,2)
         AND aso.SALE_ORDER_STATUS = 4
@@ -5116,8 +5118,8 @@
         ELSE 0
         END) "truckNetWeight",
         SUM(CASE WHEN
-        ASM.IS_POUND_SALE = 0 AND TWR.RESULT_NET_WEIGHT IS NOT NULL
-        THEN TWR.RESULT_NET_WEIGHT
+        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  ASM.WEIGHT_BATCH_ID IS NOT NULL
         THEN ASM.MATERIAL_WEIGHT
         END) "truckThoWeight",
@@ -5141,6 +5143,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 TMSTRUCK_WEIGHT_BATCH TWB
+        ON TWB .WEIGHT_BATCH_ID = ASM .WEIGHT_BATCH_ID
         WHERE
         nvl(aso.DELETED,0) in (0,2)
         AND aso.SALE_ORDER_STATUS = 4