This commit is contained in:
linfso 2024-07-09 17:15:03 +08:00
parent 588cf6fa19
commit 3aa736a946

View File

@ -213,13 +213,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and a.dispatch_underling_site_code = #{params.dispatchUnderlingSiteCode}
</if>
<if test="params.mergeStatus != null and params.mergeStatus == 1">
and b.settle_bill_no is null
and b.bl_confirm='1'
and b.bl_site_confirm='1'
</if>
<if test="params.mergeStatus != null and params.mergeStatus == 2">
and b.settle_bill_no is not null
and b.bl_confirm='1'
and b.bl_site_confirm='1'
</if>
<if test="params.payee != null and params.payee != ''">