Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

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

@@ -1424,8 +1424,8 @@
         ON TTR.ORDER_ID = OOM.ORDER_ID
         LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
         ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-        AND TWR.MATERIAL_ID = OOM.MATERIAL_ID
-        AND TWR.SALE_MATERIAL_ID = OOM.SALE_MATERIAL_ID
+        AND ((TWR.MATERIAL_ID = OOM.MATERIAL_ID AND TWR.SALE_MATERIAL_ID IS null)
+            OR (TWR.SALE_MATERIAL_ID = OOM.SALE_MATERIAL_ID AND TWR.SALE_MATERIAL_ID IS not null))
         WHERE OOM.ORDER_ID = #{orderId}
     </select>
     <select id="getLuhaoNum" resultType="java.util.Map" parameterType="decimal">