From d703dc1cb7452747c9ab6a2ef9433929f6780661 Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Thu, 5 Dec 2024 20:11:24 +0800
Subject: [PATCH] =?UTF-8?q?2024.12.05=20=E4=BA=A7=E5=93=81=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=E6=94=B6=E9=9B=86-=E9=A1=B9=E7=9B=AE=E7=89=A9?=
 =?UTF-8?q?=E6=96=99-=E9=87=8F=E4=BA=A7BOM?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pms/controller/EamProjectController.java      |  7 +++++++
 .../modules/pms/data/EamProjectPartInfoData.java  | 15 +++++++++++++++
 .../sys/modules/pms/mapper/EamProjectMapper.java  |  2 ++
 .../modules/pms/service/EamProjectService.java    |  2 ++
 .../pms/service/Impl/EamProjectServiceImpl.java   |  6 ++++++
 .../resources/mapper/pms/EamProjectMapper.xml     |  4 ++++
 6 files changed, 36 insertions(+)

diff --git a/src/main/java/com/xujie/sys/modules/pms/controller/EamProjectController.java b/src/main/java/com/xujie/sys/modules/pms/controller/EamProjectController.java
index 396768b7..ab4201c0 100644
--- a/src/main/java/com/xujie/sys/modules/pms/controller/EamProjectController.java
+++ b/src/main/java/com/xujie/sys/modules/pms/controller/EamProjectController.java
@@ -430,4 +430,11 @@ public class EamProjectController {
         eamProjectService.sendEmail();
         return R.ok();
     }
+
+    @PostMapping("/searchMassProductionBomList")
+    @ResponseBody
+    public R searchMassProductionBomList(@RequestBody EamProjectPartInfoData inData){
+        List<EamProjectPartInfoData> list = eamProjectService.searchMassProductionBomList(inData);
+        return R.ok().put("list", list);
+    }
 }
diff --git a/src/main/java/com/xujie/sys/modules/pms/data/EamProjectPartInfoData.java b/src/main/java/com/xujie/sys/modules/pms/data/EamProjectPartInfoData.java
index c30d406a..11930c9a 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/EamProjectPartInfoData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/EamProjectPartInfoData.java
@@ -102,6 +102,21 @@ public class EamProjectPartInfoData extends EamProjectInfoData{
     @TableField(exist = false)
     private String status2;
 
+    @TableField(exist = false)
+    private String PartNo2;
+
+    @TableField(exist = false)
+    private String PartDesc2;
+
+    @TableField(exist = false)
+    private Double QtyAssembly;
+
+    @TableField(exist = false)
+    private Double ScrapFactor;
+
+    @TableField(exist = false)
+    private Integer Levels;
+
     @Override
     public String getcQualityEngineer1() {
         return cQualityEngineer1;
diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/EamProjectMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/EamProjectMapper.java
index 8fe4dce9..9a015e0b 100644
--- a/src/main/java/com/xujie/sys/modules/pms/mapper/EamProjectMapper.java
+++ b/src/main/java/com/xujie/sys/modules/pms/mapper/EamProjectMapper.java
@@ -123,4 +123,6 @@ public interface EamProjectMapper {
     IPage<SysOssEntity> searchSopFileList(Page<SysOssEntity> sysOssEntityPage,@Param("query")  SysOssEntity inData);
 
     List<ProofingInformationData> getEmailsByUsernames(@Param("usernames")List<String> userNames, @Param("site") String site);
+
+    List<EamProjectPartInfoData> searchMassProductionBomList(@Param("data")EamProjectPartInfoData inData);
 }
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/EamProjectService.java b/src/main/java/com/xujie/sys/modules/pms/service/EamProjectService.java
index 773e2919..581aa011 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/EamProjectService.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/EamProjectService.java
@@ -81,4 +81,6 @@ public interface EamProjectService {
     void deleteAndSaveHandle(List<ProjectProductionValidationDocumentData> list);
 
     void saveHandle(List<ProjectProductionValidationDocumentData> list);
+
+    List<EamProjectPartInfoData> searchMassProductionBomList(EamProjectPartInfoData inData);
 }
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java
index c45ebcb7..92155126 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java
@@ -373,6 +373,12 @@ public class EamProjectServiceImpl implements EamProjectService {
             }
     }
 
+    @Override
+    public List<EamProjectPartInfoData> searchMassProductionBomList(EamProjectPartInfoData inData) {
+        List<EamProjectPartInfoData> list = EamProjectMapper.searchMassProductionBomList(inData);
+        return list;
+    }
+
     @Override
     public boolean checkProductionValidationDocument(List<ProjectProductionValidationDocumentData> list) {
         for (ProjectProductionValidationDocumentData inData : list) {
diff --git a/src/main/resources/mapper/pms/EamProjectMapper.xml b/src/main/resources/mapper/pms/EamProjectMapper.xml
index 39e5a5d2..5f8fb87e 100644
--- a/src/main/resources/mapper/pms/EamProjectMapper.xml
+++ b/src/main/resources/mapper/pms/EamProjectMapper.xml
@@ -578,6 +578,10 @@
                               </foreach>
 
     </select>
+    <select id="searchMassProductionBomList"
+            resultType="com.xujie.sys.modules.pms.data.EamProjectPartInfoData">
+        {call dbo.plm_get_part_fullBOM(#{data.site, mode=IN}, #{data.projectId, mode=IN}, #{data.projectPartId, mode=IN})}
+    </select>
     <insert id="saveNewProjectPart" useGeneratedKeys="true" keyProperty="projectPartId">
         INSERT INTO plm_project_part (
             site,