diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index 1dd955482..9e9886b01 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -685,6 +685,7 @@ and a.bl_sign=#{blSign} + and a.send_date = ]]> #{params.beginDate} @@ -718,7 +719,9 @@ SELECT #{params.privSiteCode} FROM dual ) and ( - a.take_piece_employee_code=#{params.privEmpCode} or (a.take_piece_employee_code is null) + a.take_piece_employee_code=#{params.privEmpCode} + or (a.pickup_method in('1','3') and a.operate_employee_code is null ) + or (a.operate_employee_code=#{params.privEmpCode} ) ) )