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

Merge pull request 'develop' (#259) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/259
This commit is contained in:
heyu 2025-12-08 17:01:17 +08:00
commit eb6f23dccc
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -205,7 +205,7 @@
<if test="feeType != null and feeType != ''"> and fee_type = #{feeType}</if>
<if test="splitType != null and splitType != ''"> and split_type = #{splitType}</if>
<if test="transType != null and transType != ''"> and trans_type=#{transType}</if>
<if test="transSignNo != null and transSignNo != ''"> and trans_sign_no like concat('%', #{transSignNo}, '%')</if>
<if test="transSignNo != null and transSignNo != ''"> and FIND_IN_SET(trans_sign_no,#{transSignNo})</if>
<if test="supplierCode != null and supplierCode != ''"> and supplier_code=#{supplierCode} </if>
<if test="supplierName != null and supplierName != ''"> and supplier_name like concat('%', #{supplierName}, '%')</if>
<if test="sendPlace != null and sendPlace != ''"> and send_place=#{sendPlace}</if>

1
emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMapper.xml
View File

@ -576,6 +576,7 @@
and d.bill_code = #{billCode}
and b.del_flag = '0'
and d.del_flag = '0'
and d.waybill_batch_status != '2'
<if test="id != null">AND d.id != #{id}</if>
group by b.id, b.batch_no, b.batch_name, b.batch_date, b.supplier_code, b.trans_line_type,
b.product_type, b.batch_type, b.trans_type, b.start_site_code, b.send_country,