From 771752b3be2a0aba767f7e278d8c52a0fcc4b09f Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 24 Sep 2024 14:13:42 +0800
Subject: [PATCH] =?UTF-8?q?2024-09-24=20RFQ=20=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../part/service/impl/PartInformationServiceImpl.java        | 5 ++++-
 .../com/xujie/sys/modules/part/vo/PartInformationVo.java     | 1 +
 src/main/resources/mapper/part/PartInformationMapper.xml     | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/xujie/sys/modules/part/service/impl/PartInformationServiceImpl.java b/src/main/java/com/xujie/sys/modules/part/service/impl/PartInformationServiceImpl.java
index 7025a349..3f832d4d 100644
--- a/src/main/java/com/xujie/sys/modules/part/service/impl/PartInformationServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/part/service/impl/PartInformationServiceImpl.java
@@ -148,12 +148,12 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         String site = inData.getSite();
         String buNo = inData.getBuNo();
         String partNo = inData.getPartNo();
-        //String functionType = "IP";
         String umId = inData.getUmId() == null ? "" : inData.getUmId();
         String familyId = inData.getFamilyID() == null ? "" : inData.getFamilyID();
         String productGroupId1 = inData.getOtherGroup1() == null ? "" : inData.getOtherGroup1();
         String productGroupId2 = inData.getOtherGroup2() == null ? "" : inData.getOtherGroup2();
         String productGroupId3 = inData.getOtherGroup3() == null ? "" : inData.getOtherGroup3();
+        String codeNo = inData.getCodeNo() == null ? "" : inData.getCodeNo();
         List<Object> params = new ArrayList<>();
         params.add(site);
         params.add(buNo);
@@ -163,6 +163,7 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         params.add(productGroupId1);
         params.add(productGroupId2);
         params.add(productGroupId3);
+        params.add(codeNo);
         // 执行方法
         List<Map<String, Object>> resultList = procedureDao.getProcedureData("checkSavePart", params);
         return resultList.get(0);
@@ -232,6 +233,7 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         String productGroupId1 = inData.getOtherGroup1() == null ? "" : inData.getOtherGroup1();
         String productGroupId2 = inData.getOtherGroup2() == null ? "" : inData.getOtherGroup2();
         String productGroupId3 = inData.getOtherGroup3() == null ? "" : inData.getOtherGroup3();
+        String codeNo = inData.getCodeNo() == null ? "" : inData.getCodeNo();
         List<Object> params = new ArrayList<>();
         params.add(site);
         params.add(buNo);
@@ -241,6 +243,7 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         params.add(productGroupId1);
         params.add(productGroupId2);
         params.add(productGroupId3);
+        params.add(codeNo);
         // 执行方法
         List<Map<String, Object>> resultList = procedureDao.getProcedureData("checkUpdatePart", params);
         return resultList.get(0);
diff --git a/src/main/java/com/xujie/sys/modules/part/vo/PartInformationVo.java b/src/main/java/com/xujie/sys/modules/part/vo/PartInformationVo.java
index 6833f3b1..0daae5b3 100644
--- a/src/main/java/com/xujie/sys/modules/part/vo/PartInformationVo.java
+++ b/src/main/java/com/xujie/sys/modules/part/vo/PartInformationVo.java
@@ -103,4 +103,5 @@ public class PartInformationVo extends PartInformationEntity {
     private String alternativeNo;
     private String alternativeDescription;
     private String statusDesc;
+    private String activeDesc;
 }
diff --git a/src/main/resources/mapper/part/PartInformationMapper.xml b/src/main/resources/mapper/part/PartInformationMapper.xml
index e72c96ec..57a8ca40 100644
--- a/src/main/resources/mapper/part/PartInformationMapper.xml
+++ b/src/main/resources/mapper/part/PartInformationMapper.xml
@@ -15,6 +15,7 @@
         created_by as createBy,
         creation_date as createDate,
         active,
+        case when active = 'Y' then '是' when active = 'N' then '否' else '' end as activeDesc,
         remark,
         key_part,
         qty_box_roll,