From 0cd65109d9727a7e474b35ad15c429939c43bcd7 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 12 Feb 2026 14:47:34 +0800
Subject: [PATCH] =?UTF-8?q?2026-02-12=201=E3=80=81=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E6=8A=A5=E4=BB=B7=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96=202?=
 =?UTF-8?q?=E3=80=81ecn=20=E6=96=B0IFS=E6=96=99=E5=8F=B7=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../change/entity/ChangeRequestDetailEntity.java     |  5 +++++
 .../service/impl/ChangeManagementServiceImpl.java    |  2 +-
 .../modules/quote/service/impl/QuoteServiceImpl.java |  2 ++
 .../mapper/change/ChangeManagementMapper.xml         |  1 +
 src/main/resources/mapper/quote/QuoteMapper.xml      | 12 ++++++++++--
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/spring/modules/change/entity/ChangeRequestDetailEntity.java b/src/main/java/com/spring/modules/change/entity/ChangeRequestDetailEntity.java
index 3e92a312..b6477dd7 100644
--- a/src/main/java/com/spring/modules/change/entity/ChangeRequestDetailEntity.java
+++ b/src/main/java/com/spring/modules/change/entity/ChangeRequestDetailEntity.java
@@ -111,4 +111,9 @@ public class ChangeRequestDetailEntity extends QueryPage implements Serializable
     //是否需要重新报价 备注
     @TableField(exist = false)
     private String manuFacturingCostRemark2;
+    /**
+     * 新IFS料号（用于前端显示，对应part表的ifs_part_no）
+     */
+    @TableField(exist = false)
+    private String finalPartNo;
 }
diff --git a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
index c3e2be01..53dbbf40 100644
--- a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
+++ b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
@@ -947,7 +947,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
             MainData md = new MainData();
             md.setFieldName(nodeDetail.getOaField());
             String fieldValue = "";
-            if (!nodeDetail.getFieldValue().isEmpty()) {
+            if (nodeDetail.getFieldValue() != null && !nodeDetail.getFieldValue().isEmpty()) {
                 md.setFieldValue(nodeDetail.getFieldValue());
                 mainData.add(md);
                 continue;
diff --git a/src/main/java/com/spring/modules/quote/service/impl/QuoteServiceImpl.java b/src/main/java/com/spring/modules/quote/service/impl/QuoteServiceImpl.java
index 90021f94..b5fd9064 100644
--- a/src/main/java/com/spring/modules/quote/service/impl/QuoteServiceImpl.java
+++ b/src/main/java/com/spring/modules/quote/service/impl/QuoteServiceImpl.java
@@ -72,6 +72,8 @@ public class QuoteServiceImpl extends ServiceImpl<QuoteMapper, Quote> implements
     @Override
     public IPage<Quote> queryQuotePage(Integer no, Integer size, Quote quote) {
         Page<Quote> page = new Page<>(no, size);
+        // 在Page对象中设置排序，避免在SQL中使用ORDER BY（SQL Server子查询限制）
+        page.addOrder(com.baomidou.mybatisplus.core.metadata.OrderItem.desc("q.id"));
         return baseMapper.queryQuotePage(page, quote);
     }
 
diff --git a/src/main/resources/mapper/change/ChangeManagementMapper.xml b/src/main/resources/mapper/change/ChangeManagementMapper.xml
index 0b7bd938..f6eab4ae 100644
--- a/src/main/resources/mapper/change/ChangeManagementMapper.xml
+++ b/src/main/resources/mapper/change/ChangeManagementMapper.xml
@@ -635,6 +635,7 @@
             a.drawing_no,
             a.draft_no,
             a.new_part_no,
+            dbo.GetIfsPartNoByPlmPartNo(a.site, a.new_part_no) as finalPartNo,
             a.new_drawing_no,
             a.new_draft_no,
             a.create_date,
diff --git a/src/main/resources/mapper/quote/QuoteMapper.xml b/src/main/resources/mapper/quote/QuoteMapper.xml
index 6b580815..8a215e16 100644
--- a/src/main/resources/mapper/quote/QuoteMapper.xml
+++ b/src/main/resources/mapper/quote/QuoteMapper.xml
@@ -47,12 +47,21 @@
                prn.node_id                                                             as nodeId,
                prn.node_name                                                           as nodeName,
                prn.is_reject                                                           as isReject,
-               dbo.get_plm_Approval_username(q.site, prh.workflow_id, prn.node_id, q.quote_version_no) as approvalUsername
+               dbo.get_plm_Approval_username(q.site, prh.workflow_id, prn.node_id, q.quote_version_no) as approvalUsername,
+               gd.plm_part_no as plmPartNo,
+               gd.ifs_part_no as ifsPartNo,
+               gd.part_desc as partDesc
         from plm_quote q
                  left join plm_customer_information c on q.customer_no = c.customer_no
                  left join plm_project_info p on q.project_no = p.project_id and q.site = p.site
                  left join plm_request_header prh on q.site = prh.site and prh.menu_id = '5011'
                  left join plm_request_node prn on q.site = prn.site and prh.classification_no = prn.classification_no and prh.workflow_id = prn.workflow_id and q.step_id = prn.step_id
+                 outer apply (
+                     select top 1 pp.plm_part_no, pp.ifs_part_no, pp.part_desc
+                     from plm_quote_group_detail qd
+                     left join part pp on qd.part_no = pp.part_no and qd.site = pp.site
+                     where qd.quote_id = q.id
+                 ) gd
         <where>
             <if test="params.id != null">
                 and q.id = #{params.id}
@@ -126,7 +135,6 @@
                 AND dbo.get_plm_Approval_username(q.site, prh.workflow_id, prn.node_id, q.quote_version_no) like #{params.approvalUsername}
             </if>
         </where>
-        order by q.id desc
     </select>
 
     <select id="queryQuoteList" resultType="com.spring.modules.quote.entity.Quote">