From 144bca283039e3ca372e9b215b3baea0163e69d6 Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Mon, 13 Jan 2025 10:04:23 +0800
Subject: [PATCH] =?UTF-8?q?2025.1.13=20=E6=96=87=E6=A1=A3=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86=20-=20=E7=89=A9=E6=96=99=20-=20=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E5=B7=A5=E8=89=BA=E8=B7=AF=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pms/controller/EamProjectController.java  |  8 ++++++
 .../pms/data/EamProjectPartInfoData.java      | 27 +++++++++++++++++++
 .../modules/pms/mapper/EamProjectMapper.java  |  2 ++
 .../pms/service/EamProjectService.java        |  2 ++
 .../service/Impl/EamProjectServiceImpl.java   |  6 +++++
 .../resources/mapper/pms/EamProjectMapper.xml |  3 +++
 6 files changed, 48 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 2c63382c..222d9fed 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
@@ -437,4 +437,12 @@ public class EamProjectController {
         List<EamProjectPartInfoData> list = eamProjectService.searchMassProductionBomList(inData);
         return R.ok().put("list", list);
     }
+
+    @PostMapping("/searchRoutingList")
+    @ResponseBody
+    public R searchRoutingList(@RequestBody EamProjectPartInfoData inData) {
+        List<EamProjectPartInfoData> list = eamProjectService.searchRoutingList(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 a8d9daed..fe85f045 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
@@ -120,6 +120,33 @@ public class EamProjectPartInfoData extends EamProjectInfoData{
     @TableField(exist = false)
     private String LevelCode;
 
+    @TableField(exist = false)
+    private String workCenterNo;
+
+    @TableField(exist = false)
+    private Integer itemNo;
+
+    @TableField(exist = false)
+    private String routingItemNo;
+
+    @TableField(exist = false)
+    private String itemDesc;
+
+    @TableField(exist = false)
+    private float laborTime;
+
+    @TableField(exist = false)
+    private float laborResources;
+
+    @TableField(exist = false)
+    private float machRunFactor;
+
+    @TableField(exist = false)
+    private String factorUnit;
+
+    @TableField(exist = false)
+    private String partNo;
+
     @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 9a015e0b..416090fb 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
@@ -125,4 +125,6 @@ public interface EamProjectMapper {
     List<ProofingInformationData> getEmailsByUsernames(@Param("usernames")List<String> userNames, @Param("site") String site);
 
     List<EamProjectPartInfoData> searchMassProductionBomList(@Param("data")EamProjectPartInfoData inData);
+
+    List<EamProjectPartInfoData> searchRoutingList(@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 581aa011..9ca6c251 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
@@ -83,4 +83,6 @@ public interface EamProjectService {
     void saveHandle(List<ProjectProductionValidationDocumentData> list);
 
     List<EamProjectPartInfoData> searchMassProductionBomList(EamProjectPartInfoData inData);
+
+    List<EamProjectPartInfoData> searchRoutingList(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 92155126..52377680 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
@@ -379,6 +379,12 @@ public class EamProjectServiceImpl implements EamProjectService {
         return list;
     }
 
+    @Override
+    public List<EamProjectPartInfoData> searchRoutingList(EamProjectPartInfoData inData) {
+        List<EamProjectPartInfoData> list = EamProjectMapper.searchRoutingList(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 5f8fb87e..fa94d3a2 100644
--- a/src/main/resources/mapper/pms/EamProjectMapper.xml
+++ b/src/main/resources/mapper/pms/EamProjectMapper.xml
@@ -582,6 +582,9 @@
             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>
+    <select id="searchRoutingList" resultType="com.xujie.sys.modules.pms.data.EamProjectPartInfoData">
+        {call dbo.rfq_get_fullRouting(#{data.site, mode=IN}, #{data.partNo, mode=IN})}
+    </select>
     <insert id="saveNewProjectPart" useGeneratedKeys="true" keyProperty="projectPartId">
         INSERT INTO plm_project_part (
             site,