From e70d28a3997ecb30bedd5189becad982edd43939 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 15 Jun 2026 15:46:44 +0800
Subject: [PATCH] =?UTF-8?q?2026-06-15=20=E8=AF=A2=E4=BB=B7=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=89=B9=E6=AE=8A=E6=9D=83=E9=99=90=EF=BC=9A=20?=
 =?UTF-8?q?=E5=BF=85=E9=9C=80=E5=AD=98=E5=9C=A8=E5=B7=B2=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?/=E5=AE=A1=E6=89=B9=E4=B8=AD=E7=9A=84=E6=8A=A5=E4=BB=B7?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=88=96=E8=AF=A2=E4=BB=B7=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E5=A4=A7=E4=BA=8E0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PartInformationServiceImpl.java  | 15 ++++++++-------
 .../mapper/QuotationInformationMapper.java        |  2 ++
 .../impl/QuotationInformationServiceImpl.java     | 13 ++++++++++---
 .../quotation/QuotationInformationMapper.xml      |  8 ++++++++
 4 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
index 8d94e8fe..bf7b76bc 100644
--- a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
+++ b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
@@ -934,13 +934,6 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
                 throw new RuntimeException("ifs 库存件修改异常信息：" + updateInventoryPartResponse.get("resultMsg"));
             }
         }
-        if (data.getCommGroup3InfoFlag() != null && data.getCommGroup3InfoFlag()) {
-            PartIfsInventory partIfsInventory = getPartIfsInventory(data); // 主表对象
-            Map<String, String> modifyCommGroup3Response = inventoryServiceBean.modifyInventoryPartCommGroup3(srv, partIfsInventory);
-            if (!"200".equals(modifyCommGroup3Response.get("resultCode"))) {
-                throw new RuntimeException("ifs 库存件CommGroup3修改异常信息：" + modifyCommGroup3Response.get("resultMsg"));
-            }
-        }
         if (data.getCostsInfoFlag()) {
             PartIfsInventoryConfig partIfsInventoryConfig = getPartIfsInventoryConfig(data); // costs对象
             // 同步Costs表数据
@@ -989,6 +982,14 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
                 log.info("ifsProperty 为空，跳过物料属性同步");
             }
         }
+        // 商品组3的编辑放到最后调用
+        if (data.getCommGroup3InfoFlag() != null && data.getCommGroup3InfoFlag()) {
+            PartIfsInventory partIfsInventory = getPartIfsInventory(data); // 主表对象
+            Map<String, String> modifyCommGroup3Response = inventoryServiceBean.modifyInventoryPartCommGroup3(srv, partIfsInventory);
+            if (!"200".equals(modifyCommGroup3Response.get("resultCode"))) {
+                throw new RuntimeException("ifs 库存件CommGroup3修改异常信息：" + modifyCommGroup3Response.get("resultMsg"));
+            }
+        }
     }
 
     @Transactional
diff --git a/src/main/java/com/spring/modules/quotation/mapper/QuotationInformationMapper.java b/src/main/java/com/spring/modules/quotation/mapper/QuotationInformationMapper.java
index 1e36245e..eae4fa96 100644
--- a/src/main/java/com/spring/modules/quotation/mapper/QuotationInformationMapper.java
+++ b/src/main/java/com/spring/modules/quotation/mapper/QuotationInformationMapper.java
@@ -63,4 +63,6 @@ public interface QuotationInformationMapper extends BaseMapper<QuotationInformat
     IPage<QuotationInformationVo> quotationInfoSearchByAnyField(Page<PlmProjectInfoData> plmProjectInfoDataPage,@Param("query") Map<String, String> params);
 
     List<QuotationInformationVo> getQuotationInfoByPart(@Param("site") String site, @Param("buNo") String buNo, @Param("testPartNo") String testPartNo, @Param("finalPartNo") String finalPartNo);
+
+    List<String> queryQuoteByQuotationBatchNo2(@Param("site") String site, @Param("quotationBatchNo") String quotationNo);
 }
\ No newline at end of file
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 7fb918f4..59005b24 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
@@ -891,16 +891,23 @@ public class QuotationInformationServiceImpl extends ServiceImpl<QuotationInform
     }
 
     private void checkProcessControl(Integer roleId, String site, String quotationBatchNo, BigDecimal quotationAmount) {
+        // 查询改询价批次号的询价条数
+        int count = baseMapper.queryQuotationByQuotationBatchNo(site,quotationBatchNo);
         if (roleId.equals(3)){
             // 判断是的存在报价明细 通过询价批次号获得报价中询价单号分组条数
             List<String> quoteList =  baseMapper.queryQuoteByQuotationBatchNo(site,quotationBatchNo);
 
-            // 查询改询价批次号的询价条数
-            int count = baseMapper.queryQuotationByQuotationBatchNo(site,quotationBatchNo);
+            // 不相等即条目不匹配，有询价单号未产生报价
+            if (count != quoteList.size() && quotationAmount.compareTo(BigDecimal.ZERO) <= 0) {
+                throw new RuntimeException("必需存在已完成的报价记录或询价金额大于0,才能提交!");
+            }
+        } else if (roleId.equals(15)) {
+            // 判断是的存在报价明细 通过询价批次号获得报价中询价单号分组条数
+            List<String> quoteList =  baseMapper.queryQuoteByQuotationBatchNo2(site,quotationBatchNo);
 
             // 不相等即条目不匹配，有询价单号未产生报价
             if (count != quoteList.size() && quotationAmount.compareTo(BigDecimal.ZERO) <= 0) {
-                throw new RuntimeException("必需存在已下达的报价记录或询价金额大于0,才能提交!");
+                throw new RuntimeException("必需存在已完成/审批中的报价记录或询价金额大于0,才能提交!");
             }
         }
     }
diff --git a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml
index a3a3ada2..80059820 100644
--- a/src/main/resources/mapper/quotation/QuotationInformationMapper.xml
+++ b/src/main/resources/mapper/quotation/QuotationInformationMapper.xml
@@ -802,6 +802,14 @@
         group by site, internal_inquiry_no
     </select>
 
+    <select id="queryQuoteByQuotationBatchNo2" resultType="java.lang.String">
+        select
+            internal_inquiry_no
+        from plm_quote_detail d
+        where site = #{site} and d.internal_inquiry_no like #{quotationBatchNo}+'%' and status in ('下达', '审批中')
+        group by site, internal_inquiry_no
+    </select>
+
     <select id="queryQuotationByQuotationBatchNo" resultType="int">
         select count(1) from plm_quotation_information where site = #{site} and quotation_batch_no = #{quotationBatchNo}
     </select>