Merge pull request 'demand: 漏组批次各网点查询相关运单' (#137) from develop into master

Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/137
This commit is contained in:
heyu 2025-07-29 19:23:08 +08:00
commit 2c733b2961

View File

@ -205,7 +205,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and w.send_date <![CDATA[ <= ]]> #{params.endSendDate}
</if>
<if test="params.privSiteCode != null and params.privSiteCode != '88888'">
and w.send_site_code=#{params.privSiteCode}
and (w.start_site_code=#{params.privSiteCode} or w.send_site_code=#{params.privSiteCode})
</if>
</where>
order by w.bill_code desc
@ -267,7 +267,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND k.trans_manager like concat('%', #{transManager}, '%')
</if>
<if test="params.privSiteCode != null and params.privSiteCode != '88888'">
and (m.start_site_code=#{params.privSiteCode} or m.next_site_code=#{params.privSiteCode})
and (w.start_site_code=#{params.privSiteCode} or w.send_site_code=#{params.privSiteCode})
</if>
<if test="lineCode != null and lineCode != ''">
AND m.line_code = #{lineCode}