diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index b16d9b8d3..0791c9402 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -2855,6 +2855,17 @@ + + + + and (a.data_from is null or a.data_from = '' or a.data_from = 'tms') + + + and a.data_from = #{dataFrom} + + + + and cust_order_id=#{custOrderId} and bill_code_sub like concat('%', #{billCodeSub}, '%') and order_status=#{orderStatus}