From 39303d672f7c08ddaff395dfd5e59b00df677023 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 27 Mar 2025 17:07:45 +0800
Subject: [PATCH] =?UTF-8?q?2025-03-27=20=E4=BB=8E=E6=AD=A3=E5=BC=8F?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E5=A4=8D=E5=88=B6=E8=BF=87=E6=9D=A5=E7=9A=84?=
 =?UTF-8?q?=EF=BC=8Cifs=20=E5=92=8C=20plm=E6=96=99=E5=8F=B7=20=3D=20partNo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../part/service/impl/PartInformationServiceImpl.java        | 5 +++++
 src/main/resources/mapper/base/BaseMapper.xml                | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

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 6419f21c..0f487909 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
@@ -2158,6 +2158,11 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
 
         // Inventory Part
         PartInformationEntity toPart = createCopyToPart(inData, fromPart);
+        // 从正式物料复制过来的，ifs 和 plm料号 = partNo
+        if ("Y".equals(fromPart.getStatus())) {
+            toPart.setPlmPartNo(toPart.getPartNo());
+            toPart.setIfsPartNo(toPart.getPartNo());
+        }
 
         // Characteristic
         if ("Y".equals(inData.getCopyCharacteristic())) {
diff --git a/src/main/resources/mapper/base/BaseMapper.xml b/src/main/resources/mapper/base/BaseMapper.xml
index dd35dad2..cd92cd6f 100644
--- a/src/main/resources/mapper/base/BaseMapper.xml
+++ b/src/main/resources/mapper/base/BaseMapper.xml
@@ -383,7 +383,9 @@
     </select>
 
     <select id="selectRoleList" resultType="java.lang.String">
-        select a.role_no from AccessRole a left join Role b on a.site=b.site and a.role_no=b.role_no
+        select a.role_no
+        from AccessRole a
+        left join Role b on a.site=b.site and a.role_no=b.role_no
         where a.site=#{site} and a.username=#{username} and b.active='Y'
     </select>