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-05-26 16:21:54 +08:00
parent fb19ee1859
commit 65a8ee4373
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -799,15 +799,19 @@ public class EmisBaseService {
return emisTransProductMapper.selectEmisTransProductList(emisTransProduct); return emisTransProductMapper.selectEmisTransProductList(emisTransProduct);
} }
/** /**
* 获取有效产品报价 * 获取有效产品报价
* @param lineCode
* @param prodCode * @param prodCode
* @param sendSiteCode * @param sendSiteCode
* @param destSiteCode * @param destSiteCode
* @param billType
* @return * @return
*/ */
public List<EmisQuotePrice> getValidQuotePriceList(String prodCode,String sendSiteCode,String destSiteCode,String billType) { public List<EmisQuotePrice> getValidQuotePriceList(String lineCode,String prodCode,String sendSiteCode,String destSiteCode,String billType) {
EmisQuotePrice queryEmisQuotePrice = new EmisQuotePrice(); EmisQuotePrice queryEmisQuotePrice = new EmisQuotePrice();
queryEmisQuotePrice.setTransLineCode(lineCode);
queryEmisQuotePrice.setProdCode(prodCode); queryEmisQuotePrice.setProdCode(prodCode);
queryEmisQuotePrice.setStatus(1); queryEmisQuotePrice.setStatus(1);
// 有效报价 在有效期内，并且未失效的报价 // 有效报价 在有效期内，并且未失效的报价

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

@ -614,7 +614,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1, "参数不完整"); throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1, "参数不完整");
} }
List<EmisQuotePrice> emisQuotePriceList=getValidQuotePriceList(emisWaybill.getProductType(), List<EmisQuotePrice> emisQuotePriceList=getValidQuotePriceList(emisWaybill.getTransLineType(),emisWaybill.getProductType(),
emisWaybill.getSendSiteCode(),emisWaybill.getDispatchUnderlingSiteCode(), emisWaybill.getSendSiteCode(),emisWaybill.getDispatchUnderlingSiteCode(),
emisWaybill.getCalcFeeType()); emisWaybill.getCalcFeeType());

10
emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml
View File

@ -54,15 +54,15 @@
<where> <where>
del_flag='0' del_flag='0'
<if test="id != null "> and id = #{id}</if> <if test="id != null "> and id = #{id}</if>
<if test="prodCode != null and prodCode != ''"> and prod_code like concat('%', #{prodCode}, '%')</if> <if test="prodCode != null and prodCode != ''"> and prod_code=#{prodCode}</if>
<if test="prodName != null and prodName != ''"> and prod_name like concat('%', #{prodName}, '%')</if> <if test="prodName != null and prodName != ''"> and prod_name like concat('%', #{prodName}, '%')</if>
<if test="prodNameEn != null and prodNameEn != ''"> and prod_name_en like concat('%', #{prodNameEn}, '%')</if> <if test="prodNameEn != null and prodNameEn != ''"> and prod_name_en like concat('%', #{prodNameEn}, '%')</if>
<if test="status != null "> and status = #{status}</if> <if test="status != null "> and status = #{status}</if>
<if test="country != null and country != ''"> and country like concat('%', #{country}, '%')</if> <if test="country != null and country != ''"> and country=#{country}</if>
<if test="transLineCode != null and transLineCode != ''"> and trans_line_code like concat('%', #{transLineCode}, '%')</if> <if test="transLineCode != null and transLineCode != ''"> and trans_line_code=#{transLineCode}</if>
<if test="transLine != null and transLine != ''"> and trans_line like concat('%', #{transLine}, '%')</if> <if test="transLine != null and transLine != ''"> and trans_line like concat('%', #{transLine}, '%')</if>
<if test="carryType != null and carryType != ''"> and carry_type like concat('%', #{carryType}, '%')</if> <if test="carryType != null and carryType != ''"> and carry_type=#{carryType}</if>
<if test="transType != null and transType != ''"> and trans_type like concat('%', #{transType}, '%')</if> <if test="transType != null and transType != ''"> and trans_type= #{transType}</if>
<if test="agingDesc != null and agingDesc != ''"> and aging_desc like concat('%', #{agingDesc}, '%')</if> <if test="agingDesc != null and agingDesc != ''"> and aging_desc like concat('%', #{agingDesc}, '%')</if>
<if test="agingFlag != null and agingFlag != ''"> and aging_flag like concat('%', #{agingFlag}, '%')</if> <if test="agingFlag != null and agingFlag != ''"> and aging_flag like concat('%', #{agingFlag}, '%')</if>
<if test="minAging != null "> and min_aging = #{minAging}</if> <if test="minAging != null "> and min_aging = #{minAging}</if>