From c864cca19192b72102a9981c522b26dae44d50c7 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 31 Oct 2024 17:48:04 +0800
Subject: [PATCH] =?UTF-8?q?2024-10-31=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/TechnicalSpecificationData.java    |  2 ++
 .../change/vo/ChangeRequestDetailVo.java      |  1 +
 .../part/mapper/PartInformationMapper.java    |  2 ++
 .../impl/PartInformationServiceImpl.java      | 20 +++++++++++--------
 .../mapper/change/ChangeManagementMapper.xml  | 14 ++++++++-----
 .../mapper/part/PartInformationMapper.xml     |  5 +++++
 6 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/spring/modules/change/entity/TechnicalSpecificationData.java b/src/main/java/com/spring/modules/change/entity/TechnicalSpecificationData.java
index d86adb73..811f19dd 100644
--- a/src/main/java/com/spring/modules/change/entity/TechnicalSpecificationData.java
+++ b/src/main/java/com/spring/modules/change/entity/TechnicalSpecificationData.java
@@ -58,4 +58,6 @@ public class TechnicalSpecificationData extends QueryPage {
      * ECN地址
      */
     private String ecnAddress;
+
+    private String oriCodeNo;
 }
diff --git a/src/main/java/com/spring/modules/change/vo/ChangeRequestDetailVo.java b/src/main/java/com/spring/modules/change/vo/ChangeRequestDetailVo.java
index 7e8dff4b..8ea1be58 100644
--- a/src/main/java/com/spring/modules/change/vo/ChangeRequestDetailVo.java
+++ b/src/main/java/com/spring/modules/change/vo/ChangeRequestDetailVo.java
@@ -9,4 +9,5 @@ import java.util.List;
 @Data
 public class ChangeRequestDetailVo extends ChangeRequestDetailEntity {
 
+    private String oriCodeNo;
 }
diff --git a/src/main/java/com/spring/modules/part/mapper/PartInformationMapper.java b/src/main/java/com/spring/modules/part/mapper/PartInformationMapper.java
index 338bbd86..c55780c6 100644
--- a/src/main/java/com/spring/modules/part/mapper/PartInformationMapper.java
+++ b/src/main/java/com/spring/modules/part/mapper/PartInformationMapper.java
@@ -267,4 +267,6 @@ public interface PartInformationMapper extends BaseMapper<PartInformationEntity>
     TblBaseDataEntity getTblBaseData(@Param("firstType") String partCatalog);
 
     List<PartIfsCatalogProperty> getMasterPartPropertyList(@Param("partNo") String partNo, @Param("codeNo") String codeNo, @Param("recordType") String ip);
+
+    String getNextPartNo2(PartInformationVo data);
 }
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 e6a3fcff..d8cb8e3d 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
@@ -2384,14 +2384,18 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
      */
     @Override
     public String getNextPartNo(PartInformationVo data) {
-        Integer no = partInformationMapper.getNextPartNo(data);
-
-        // 如果是 null，则默认为 1；否则递增
-        no = (no == null ? 1 : no + 1);
-
-        // 使用 String.format 自动填充前导零
-        String formattedNo = String.format("%05d", no);
-        return data.getIfsPartNo() + formattedNo;
+//        Integer no = partInformationMapper.getNextPartNo(data);
+//
+//        // 如果是 null，则默认为 1；否则递增
+//        no = (no == null ? 1 : no + 1);
+//
+//        // 使用 String.format 自动填充前导零
+//        String formattedNo = String.format("%05d", no);
+//
+//        return data.getIfsPartNo() + formattedNo;
+
+        String nextPartNo = partInformationMapper.getNextPartNo2(data);
+        return nextPartNo;
     }
 
     /**
diff --git a/src/main/resources/mapper/change/ChangeManagementMapper.xml b/src/main/resources/mapper/change/ChangeManagementMapper.xml
index bba12165..b0a5cf10 100644
--- a/src/main/resources/mapper/change/ChangeManagementMapper.xml
+++ b/src/main/resources/mapper/change/ChangeManagementMapper.xml
@@ -14,6 +14,7 @@
         c.customer_id,
         j.customer_desc,
         a.code_no,
+        a.ori_code_no,
         a.rev_no,
         case when a.ECN_flag = 'Y' then '变更中' else '未发起' end as ecnFlag,
         a.ECN_no,
@@ -45,8 +46,8 @@
             <if test = "query.projectDesc != null and query.projectDesc != ''">
                 AND c.project_name like #{query.projectDesc}
             </if>
-            <if test = "query.codeNo != null and query.codeNo != ''">
-                AND a.code_no like #{query.codeNo}
+            <if test = "query.oriCodeNo != null and query.oriCodeNo != ''">
+                AND a.ori_code_no like #{query.oriCodeNo}
             </if>
         </where>
     </select>
@@ -63,6 +64,7 @@
         c.customer_id,
         j.customer_desc,
         a.code_no,
+        a.ori_code_no,
         a.rev_no,
         case when a.ECN_flag = 'Y' then '变更中' else '未发起' end as ecnFlag,
         a.ECN_no,
@@ -94,8 +96,8 @@
             <if test = "projectDesc != null and projectDesc != ''">
                 AND c.project_name like #{projectDesc}
             </if>
-            <if test = "codeNo != null and codeNo != ''">
-                AND a.code_no like #{codeNo}
+            <if test = "oriCodeNo != null and oriCodeNo != ''">
+                AND a.ori_code_no like #{oriCodeNo}
             </if>
         </where>
     </select>
@@ -235,8 +237,10 @@
         a.create_date,
         a.create_by,
         a.update_date,
-        a.update_by
+        a.update_by,
+        b.ori_code_no
         FROM plm_change_request_detail a
+        left join plm_technical_specification_sheet as b on a.site = b.site and a.code_no = b.code_no
         where a.site = #{site} and a.change_no = #{changeNo}
     </select>
 
diff --git a/src/main/resources/mapper/part/PartInformationMapper.xml b/src/main/resources/mapper/part/PartInformationMapper.xml
index d3a9aabc..f74eb11c 100644
--- a/src/main/resources/mapper/part/PartInformationMapper.xml
+++ b/src/main/resources/mapper/part/PartInformationMapper.xml
@@ -1721,6 +1721,11 @@
         where part_no like #{ifsPartNo} + '%' and len(part_no) = 8
     </select>
 
+    <!-- 下一个物料编码 -->
+    <select id="getNextPartNo2" resultType="string" parameterType="com.spring.modules.part.vo.PartInformationVo">
+        select dbo.get_next_part_code(#{ifsPartNo})
+    </select>
+
     <select id="checkPartLocationType" resultType="com.spring.modules.part.vo.LocationInformationVo" parameterType="com.spring.modules.part.vo.LocationInformationVo">
         SELECT
             a.site,