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 2025-07-02 11:07:36 +08:00
parent 66d6ae20af
commit 02ffff907f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java
View File

@ -448,7 +448,7 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
// 机场提货费操作费 - 1004 // 机场提货费操作费 - 1004
List<EmisTmsCostQuotePrice> fixedQuotePrice1004List=emisTmsCostQuotePriceMapper.matchBatchFixedQuotePriceByBillCode(billCode,"1004","T"); List<EmisTmsCostQuotePrice> fixedQuotePrice1004List=emisTmsCostQuotePriceMapper.matchBatchFixedQuotePriceByBillCode(billCode,"1004","F");
if(!CollectionUtils.isEmpty(fixedQuotePrice1004List)){ if(!CollectionUtils.isEmpty(fixedQuotePrice1004List)){
// 检查重复 // 检查重复

4
emis-biz/src/main/resources/mapper/EmisTmsCostQuotePriceMapper.xml
View File

@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="matchBatchFixedQuotePriceByBillCode" parameterType="String" resultMap="EmisTmsCostQuotePriceResult"> <select id="matchBatchFixedQuotePriceByBillCode" resultMap="EmisTmsCostQuotePriceResult">
SELECT SELECT
DISTINCT DISTINCT
a.start_site_code, a.start_site_code,
@ -107,7 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND c.del_flag = '0' AND c.del_flag = '0'
AND a.start_site_code = b.start_site_code AND a.start_site_code = b.start_site_code
AND a.next_site_code = b.next_site_code AND a.next_site_code = b.next_site_code
<if test="blNeedMatchSupplier != null and blNeedMatchSupplier == 'T'"> <if test="blNeedMatchSupplier != null and blNeedMatchSupplier = 'T' ">
AND a.supplier_code = b.supplier_code AND a.supplier_code = b.supplier_code
</if> </if>
AND b.batch_no = c.batch_no AND b.batch_no = c.batch_no