liyg 1 سال پیش
والد
کامیت
212d1affa9
1فایلهای تغییر یافته به همراه6 افزوده شده و 2 حذف شده
  1. 6 2
      src/main/resources/com/steerinfo/dil/mapper/StatisticalReportMapper.xml

+ 6 - 2
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