diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index 0791c9402..531e7ab71 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -1290,6 +1290,17 @@ + + + + and (a.data_from is null or a.data_from = '' or a.data_from = 'tms') + + + and a.data_from = #{dataFrom} + + + + and a.order_type=#{orderType} and a.cust_order_id=#{custOrderId}