diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index de2587b03..7769a2b2d 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -1941,6 +1941,7 @@ from emis_waybill a left join emis_customer_user a4 on a.cust_no=a4.monthly_pay_code and a4.del_flag='0' left join emis_waybill_other wss on a.id=wss.waybill_id and wss.del_flag='0' + left join emis_money_user mu on wss.money_user_id=mu.id and mu.del_flag='0' a.del_flag='0' and a.order_status !='0' and a.order_status!='2' and a.id = #{id} @@ -2256,6 +2257,9 @@ and DATEDIFF(NOW(), a.send_date) 10 + + AND mu.id = #{params.moneyUserId} + and ( @@ -2271,6 +2275,21 @@ select 1 from emis_customer_user ecu where a.cust_no=ecu.monthly_pay_code and ecu.owner_site=#{params.privSiteCode} ) + + or EXISTS ( + select 1 from emis_waybill_other wss_mu + inner join emis_money_user emu on wss_mu.money_user_id=emu.id and emu.del_flag='0' + left join sys_user su_payee on emu.payee=su_payee.emp_name and su_payee.del_flag='0' + left join sys_user su_salesmen on emu.salesmen=su_salesmen.emp_name and su_salesmen.del_flag='0' + left join sys_user su_sales_support on emu.sales_support=su_sales_support.emp_name and su_sales_support.del_flag='0' + where wss_mu.waybill_id=a.id and wss_mu.del_flag='0' + and ( + su_payee.owner_site_code=#{params.privSiteCode} + or su_salesmen.owner_site_code=#{params.privSiteCode} + or su_sales_support.owner_site_code=#{params.privSiteCode} + ) + ) + or a.salesmen=#{params.privEmpName} or a.payee=#{params.privEmpName}