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-31 04:15:57 +08:00
parent 9b922ac109
commit c350ece815
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -912,13 +912,15 @@ public class EmisBaseService {
queryEmisQuotePrice.setSendAreaSiteCode(sendSiteCode);
queryEmisQuotePrice.setDispAreaSiteCode(destSiteCode);
// 客户
queryEmisQuotePrice.setCustomerCode(customerCode);
queryEmisQuotePrice.setCustNo(custNo);
Map existsMap = new HashMap();
List<EmisQuotePrice> listQuoteValid = new ArrayList<>();
// 客户优先级最高
// 客户优先级最高,先查询客户特殊报价 客户
queryEmisQuotePrice.setQuoteType("3,4");
queryEmisQuotePrice.setCustomerCode(customerCode);
queryEmisQuotePrice.setCustNo(custNo);
List<EmisQuotePrice> listQuoteVip = emisQuotePriceMapper.selectEmisQuotePriceList(queryEmisQuotePrice);
for (EmisQuotePrice item:listQuoteVip) {
existsMap.put(item.getFeeType(),"1");
@ -927,6 +929,7 @@ public class EmisBaseService {
// 取通用数据排重
queryEmisQuotePrice.setCustomerCode(null);
queryEmisQuotePrice.setCustNo(null);
queryEmisQuotePrice.setQuoteType("1,2");
List<EmisQuotePrice> listQuote = emisQuotePriceMapper.selectEmisQuotePriceList(queryEmisQuotePrice);
for (EmisQuotePrice item:listQuote) {
if(existsMap.containsKey(item.getFeeType())){

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

@ -112,7 +112,7 @@
<if test="quoteCode != null and quoteCode != ''"> and quote_code=#{quoteCode}</if>
<if test="transLineCode != null and transLineCode != ''"> and trans_line_code=#{transLineCode}</if>
<if test="quoteType != null and quoteType != ''"> and quote_type= #{quoteType}</if>
<if test="quoteType != null and quoteType != ''"> and FIND_IN_SET(quote_type,#{quoteType})</if>
<if test="customerCode != null and customerCode != ''"> and customer_code=#{customerCode}</if>
<if test="custNo != null and custNo != ''"> and cust_no=#{custNo}</if>