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:14:22 +08:00
parent 7ade873106
commit e81f3f7ea9
3 changed files with 4 additions and 4 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/mapper/EmisTmsCostQuotePriceMapper.java
View File

@ -38,7 +38,7 @@ public interface EmisTmsCostQuotePriceMapper extends BaseMapper<EmisTmsCostQuote
* @param blNeedMatchSupplier T-需要匹配对应的供应商 * @param blNeedMatchSupplier T-需要匹配对应的供应商
* @return * @return
*/ */
public List<EmisTmsCostQuotePrice> matchBatchFixedQuotePriceByBillCode(@Param("billCode") String bilCode,@Param("feeType") String feeType,@Param("blNeedMatchSupplier") String blNeedMatchSupplier); public List<EmisTmsCostQuotePrice> matchBatchFixedQuotePriceByBillCode(@Param("billCode") String bilCode,@Param("feeType") String feeType,@Param("blNeedMatchSupplier") Integer blNeedMatchSupplier);
/** /**
* 查询列表 * 查询列表

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

@ -369,7 +369,7 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
// 网点机场短驳费 - 1002 // 网点机场短驳费 - 1002
// （2）新创建表（短驳费）：机场到网点之间的距离表；记录 起始网点、下一网点、开始日期、结束日期、公里数、单价、供应商、计费类型：按公斤 // （2）新创建表（短驳费）：机场到网点之间的距离表；记录 起始网点、下一网点、开始日期、结束日期、公里数、单价、供应商、计费类型：按公斤
List<EmisTmsCostQuotePrice> fixedQuotePrice1002List=emisTmsCostQuotePriceMapper.matchBatchFixedQuotePriceByBillCode(billCode,"1002","T"); List<EmisTmsCostQuotePrice> fixedQuotePrice1002List=emisTmsCostQuotePriceMapper.matchBatchFixedQuotePriceByBillCode(billCode,"1002",1);
if(!CollectionUtils.isEmpty(fixedQuotePrice1002List)){ if(!CollectionUtils.isEmpty(fixedQuotePrice1002List)){
// 检查重复 // 检查重复
@ -448,7 +448,7 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService
// 机场提货费操作费 - 1004 // 机场提货费操作费 - 1004
List<EmisTmsCostQuotePrice> fixedQuotePrice1004List=emisTmsCostQuotePriceMapper.matchBatchFixedQuotePriceByBillCode(billCode,"1004","F"); List<EmisTmsCostQuotePrice> fixedQuotePrice1004List=emisTmsCostQuotePriceMapper.matchBatchFixedQuotePriceByBillCode(billCode,"1004",-1);
if(!CollectionUtils.isEmpty(fixedQuotePrice1004List)){ if(!CollectionUtils.isEmpty(fixedQuotePrice1004List)){
// 检查重复 // 检查重复

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

@ -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 == 1 ">
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