diff --git a/src/main/java/com/spring/modules/quotation/service/impl/QuotationInformationServiceImpl.java b/src/main/java/com/spring/modules/quotation/service/impl/QuotationInformationServiceImpl.java index 8b5a4e01..17acb462 100644 --- a/src/main/java/com/spring/modules/quotation/service/impl/QuotationInformationServiceImpl.java +++ b/src/main/java/com/spring/modules/quotation/service/impl/QuotationInformationServiceImpl.java @@ -705,7 +705,7 @@ public class QuotationInformationServiceImpl extends ServiceImpl controlList = requestManageService.getProcessSelect(cData); if(!controlList.isEmpty()){ for (int i = 0; i < controlList.size(); i++) { - checkProcessControl(controlList.get(i).getRoleId(),controlList.get(i).getSite(),data.getQuotationNo()); + checkProcessControl(controlList.get(i).getRoleId(),controlList.get(i).getSite(),data.getQuotationBatchNo()); } } // 4、 接口:流程提交接口(同意) / 流程退回接口(驳回) @@ -763,12 +763,12 @@ public class QuotationInformationServiceImpl extends ServiceImpl quoteList = baseMapper.queryQuoteByQuotationBatchNo(site,quotationNo); + List quoteList = baseMapper.queryQuoteByQuotationBatchNo(site,quotationBatchNo); - int count = baseMapper.queryQuotationByQuotationBatchNo(site,quotationNo); + int count = baseMapper.queryQuotationByQuotationBatchNo(site,quotationBatchNo); if (count != quoteList.size()){ throw new RuntimeException("该询价单的报价明细不全,不能提交!"); diff --git a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml index 4df095fd..57c948f9 100644 --- a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml +++ b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml @@ -624,7 +624,7 @@ diff --git a/src/main/resources/mapper/quote/QuoteDetailOtherMapper.xml b/src/main/resources/mapper/quote/QuoteDetailOtherMapper.xml index d1abbde7..6206fa9e 100644 --- a/src/main/resources/mapper/quote/QuoteDetailOtherMapper.xml +++ b/src/main/resources/mapper/quote/QuoteDetailOtherMapper.xml @@ -24,6 +24,7 @@ update_date from plm_quote_detail_other pqdt where pqdt.quote_detail_id = #{quoteDetailId} + order by pqdt.item_no desc