From a20c8114adcc4a1673c762a2624f3aaf3b673e9a Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 20 Dec 2024 17:42:04 +0800
Subject: [PATCH] =?UTF-8?q?2024-12-20=20=E6=8E=A5=E5=8F=A3=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/part/service/impl/BomManagementServiceImpl.java   | 2 +-
 .../part/service/impl/MasterPartInformationServiceImpl.java   | 4 ++--
 .../modules/part/service/impl/PartInformationServiceImpl.java | 3 ++-
 .../part/service/impl/RoutingManagementServiceImpl.java       | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/spring/modules/part/service/impl/BomManagementServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/BomManagementServiceImpl.java
index 60edf2b2..4c399077 100644
--- a/src/main/java/com/spring/modules/part/service/impl/BomManagementServiceImpl.java
+++ b/src/main/java/com/spring/modules/part/service/impl/BomManagementServiceImpl.java
@@ -65,7 +65,7 @@ public class BomManagementServiceImpl extends ServiceImpl<BomManagementMapper, B
         if (ifsUser == null || !org.apache.commons.lang3.StringUtils.isNotBlank(ifsUser.getIfsUsername()) || !org.apache.commons.lang3.StringUtils.isNotBlank(ifsUser.getIfsPassword())) {
             throw new RuntimeException("获取用户的IFS账号密码为空值!");
         }
-        Server srv = ifsServer.getIfsServer(ifsUser.getUsername(), ifsUser.getPassword());
+        Server srv = ifsServer.getIfsServer(ifsUser.getIfsUsername(), ifsUser.getIfsPassword());
         return srv;
     }
 
diff --git a/src/main/java/com/spring/modules/part/service/impl/MasterPartInformationServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/MasterPartInformationServiceImpl.java
index e908169e..4e351695 100644
--- a/src/main/java/com/spring/modules/part/service/impl/MasterPartInformationServiceImpl.java
+++ b/src/main/java/com/spring/modules/part/service/impl/MasterPartInformationServiceImpl.java
@@ -88,7 +88,7 @@ public class MasterPartInformationServiceImpl extends ServiceImpl<MasterPartInfo
         if (ifsUser == null || !org.apache.commons.lang3.StringUtils.isNotBlank(ifsUser.getIfsUsername()) || !org.apache.commons.lang3.StringUtils.isNotBlank(ifsUser.getIfsPassword())) {
             throw new RuntimeException("获取用户的IFS账号密码为空值!");
         }
-        Server srv = ifsServer.getIfsServer(ifsUser.getUsername(), ifsUser.getPassword());
+        Server srv = ifsServer.getIfsServer(ifsUser.getIfsUsername(), ifsUser.getIfsPassword());
         return srv;
     }
 
@@ -488,7 +488,7 @@ public class MasterPartInformationServiceImpl extends ServiceImpl<MasterPartInfo
                 if (ifsUser == null || !StringUtils.isNotBlank(ifsUser.getIfsUsername()) || !StringUtils.isNotBlank(ifsUser.getIfsPassword())) {
                     throw new RuntimeException("获取用户的IFS账号密码为空值!");
                 }
-                Server srv = ifsServer.getIfsServer(ifsUser.getUsername(), ifsUser.getPassword());
+                Server srv = ifsServer.getIfsServer(ifsUser.getIfsUsername(), ifsUser.getIfsPassword());
                 // 获取ifs PartCatalog 对象
                 PartIfsCatalog partIfsCatalog = getPartIfsCatalog(ifsPart);
                 // 判断ifs是否已存在物料件
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 b8fa6f02..551a6c15 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
@@ -333,7 +333,7 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         if (ifsUser == null || !org.apache.commons.lang3.StringUtils.isNotBlank(ifsUser.getIfsUsername()) || !org.apache.commons.lang3.StringUtils.isNotBlank(ifsUser.getIfsPassword())) {
             throw new RuntimeException("获取用户的IFS账号密码为空值!");
         }
-        Server srv = ifsServer.getIfsServer(ifsUser.getUsername(), ifsUser.getPassword());
+        Server srv = ifsServer.getIfsServer(ifsUser.getIfsUsername(), ifsUser.getIfsPassword());
         return srv;
     }
 
@@ -2783,6 +2783,7 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         MasterPartInformationEntity masterPartInformation = new MasterPartInformationEntity();
         masterPartInformation.setPartNo(ifsPart.getPartNo());
         masterPartInformation.setPlmPartNo(data.getPartNo());
+        masterPartInformation.setUpdateBy(data.getUpdateBy());
         masterPartInformationService.toBecomeOfficialMasterPart(masterPartInformation);
 
         // 获取ifsServer
diff --git a/src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java
index 4b3c83c8..045cd813 100644
--- a/src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java
+++ b/src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java
@@ -131,7 +131,7 @@ public class RoutingManagementServiceImpl extends ServiceImpl<RoutingManagementM
         if (ifsUser == null || !org.apache.commons.lang3.StringUtils.isNotBlank(ifsUser.getIfsUsername()) || !org.apache.commons.lang3.StringUtils.isNotBlank(ifsUser.getIfsPassword())) {
             throw new RuntimeException("获取用户的IFS账号密码为空值!");
         }
-        Server srv = ifsServer.getIfsServer(ifsUser.getUsername(), ifsUser.getPassword());
+        Server srv = ifsServer.getIfsServer(ifsUser.getIfsUsername(), ifsUser.getIfsPassword());
         return srv;
     }