2025-1-8

src/main/java/com/spring/modules/quotation/service/impl/QuotationInformationServiceImpl.java

@@ -705,7 +705,7 @@ public class QuotationInformationServiceImpl extends ServiceImpl<QuotationInform
         List<PlmProcessControllBaseData> 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<QuotationInform
         }
     }
 
-    private void checkProcessControl(Integer roleId, String site, String quotationNo) {
+    private void checkProcessControl(Integer roleId, String site, String quotationBatchNo) {
         if (roleId.equals(3)){
             // 判断是的存在报价明细
-            List<String> quoteList =  baseMapper.queryQuoteByQuotationBatchNo(site,quotationNo);
+            List<String> quoteList =  baseMapper.queryQuoteByQuotationBatchNo(site,quotationBatchNo);
 
-            int count = baseMapper.queryQuotationByQuotationBatchNo(site,quotationNo);
+            int count = baseMapper.queryQuotationByQuotationBatchNo(site,quotationBatchNo);
 
             if (count != quoteList.size()){
                 throw new RuntimeException("该询价单的报价明细不全,不能提交!");

src/main/resources/mapper/quotation/QuotationInformationMapper.xml

@@ -624,7 +624,7 @@
     <select id="queryQuoteByQuotationBatchNo" resultType="java.lang.String">
         select
             internal_inquiry_no
-        from plm_quote_detail d
+        from plm_quote_group_detail d
         where site = #{site} and d.internal_inquiry_no like #{quotationBatchNo}+'%'
         group by site, internal_inquiry_no
     </select>

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
     </select>
 
     <select id="queryItemNo" resultType="int">

src/main/resources/mapper/quote/QuoteDetailTestMapper.xml

@@ -24,6 +24,7 @@
                update_date
         from plm_quote_detail_test pqdt
         where pqdt.quote_detail_id = #{quoteDetailId}
+        order by pqdt.item_no desc
     </select>
 
     <select id="queryItemNo" resultType="int">