diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 67be95814..b6714c559 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -799,15 +799,19 @@ public class EmisBaseService { return emisTransProductMapper.selectEmisTransProductList(emisTransProduct); } + /** * 获取有效产品报价 + * @param lineCode * @param prodCode * @param sendSiteCode * @param destSiteCode + * @param billType * @return */ - public List getValidQuotePriceList(String prodCode,String sendSiteCode,String destSiteCode,String billType) { + public List getValidQuotePriceList(String lineCode,String prodCode,String sendSiteCode,String destSiteCode,String billType) { EmisQuotePrice queryEmisQuotePrice = new EmisQuotePrice(); + queryEmisQuotePrice.setTransLineCode(lineCode); queryEmisQuotePrice.setProdCode(prodCode); queryEmisQuotePrice.setStatus(1); // 有效报价 在有效期内,并且未失效的报价 diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index e4d84b0f9..ccf9b82d1 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -614,7 +614,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1, "参数不完整"); } - List emisQuotePriceList=getValidQuotePriceList(emisWaybill.getProductType(), + List emisQuotePriceList=getValidQuotePriceList(emisWaybill.getTransLineType(),emisWaybill.getProductType(), emisWaybill.getSendSiteCode(),emisWaybill.getDispatchUnderlingSiteCode(), emisWaybill.getCalcFeeType()); diff --git a/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml b/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml index 1b5c6cece..68795b420 100644 --- a/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml @@ -54,15 +54,15 @@ del_flag='0' and id = #{id} - and prod_code like concat('%', #{prodCode}, '%') + and prod_code=#{prodCode} and prod_name like concat('%', #{prodName}, '%') and prod_name_en like concat('%', #{prodNameEn}, '%') and status = #{status} - and country like concat('%', #{country}, '%') - and trans_line_code like concat('%', #{transLineCode}, '%') + and country=#{country} + and trans_line_code=#{transLineCode} and trans_line like concat('%', #{transLine}, '%') - and carry_type like concat('%', #{carryType}, '%') - and trans_type like concat('%', #{transType}, '%') + and carry_type=#{carryType} + and trans_type= #{transType} and aging_desc like concat('%', #{agingDesc}, '%') and aging_flag like concat('%', #{agingFlag}, '%') and min_aging = #{minAging}