aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-09-07 12:05:04 +08:00
parent 93eea34929
commit 324ac24c41
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
View File

@ -207,6 +207,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and a.send_company like concat('%', #{params.sendCompany}, '%')
</if>
<if test="blMerge != null and blMerge != ''"> and b.bl_merge=#{blMerge}</if>
<if test="params.mergeStatus != null and params.mergeStatus == 1">
and b.bl_merge='0'
@ -350,7 +354,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and a.send_company like concat('%', #{params.sendCompany}, '%')
</if>
<if test="blMerge != null and blMerge != ''"> and b.bl_merge=#{blMerge}</if>
<if test="params.mergeStatus != null and params.mergeStatus == 1">
and b.bl_merge='0'
@ -486,6 +490,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and a.dispatch_underling_site_code = #{params.dispatchUnderlingSiteCode}
</if>
<if test="blMerge != null and blMerge != ''"> and b.bl_merge=#{blMerge}</if>
<if test="params.mergeStatus != null and params.mergeStatus == 1">
and b.bl_merge='0'
and b.bl_confirm_center='1'

2
emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
View File

@ -636,8 +636,6 @@
where id = #{id}
</update>
<!-- and rel_id = #{promId} -->
<delete id="deleteTransferScanRecord" parameterType="String">
update emis_tms_scan_record set del_flag='1' where scan_type='80' and main_bill_code=#{billCode}
</delete>