liyg 2 лет назад
Родитель
Сommit
b7ee66351b

+ 3 - 1
src/main/resources/com/steerinfo/dil/mapper/StatisticalReportMapper.xml

@@ -417,7 +417,9 @@
         AND ASO.SHIPPER_ID = #{shipperId}
         AND OO.ORDER_STATUS IN (2,5)
         AND TWR.RESULT_NET_WEIGHT IS NOT NULL
-        --AND ASM.MATERIAL_NUMBER IS NOT NULL
+        <if test="orderTypee!=null and orderTypee==1">
+            AND ASM.MATERIAL_NUMBER IS NOT NULL
+        </if>
         <if test="carrierSsoId != null">
             and RC2.CARRIER_SSO_ID = #{carrierSsoId}
         </if>