Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS

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

@@ -3341,6 +3341,7 @@
         LEFT JOIN RMS_RECEIVE_ADDRESS RDA ON RDA.ADDRESS_ID = RRP.ADDRESS_ID
         WHERE
         OO.ORDER_ID = #{orderId}
+        and ASO.DELETED = 0
         <if test="status == null">
             AND OO.ORDER_STATUS in (4, 5, 6)
         </if>
@@ -3936,6 +3937,7 @@
         LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON OO.ORDER_ID = TTR.ORDER_ID
         WHERE
         OO.ORDER_ID = #{orderId}
+        AND ASO.DELETED = 0
         <if test="status == null">
             AND OO.ORDER_STATUS in (4, 5, 6)
         </if>