From ad1e156c8d75ab48ccf2369497b456de87c88943 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Thu, 14 Mar 2024 17:36:48 +0800
Subject: [PATCH] 1127

---
 .../controller/TechnicalSpecificationController.java     | 7 ++++---
 .../dao/TechnicalSpecificationMapper.java                | 3 ++-
 .../service/Impl/TechnicalSpecificationServiceImpl.java  | 9 +++++++--
 .../service/TechnicalSpecificationService.java           | 2 +-
 .../sampleManagement/TechnicalSpecificationMapper.xml    | 9 ++++++++-
 5 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java b/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java
index bde0b6a1..d512ca69 100644
--- a/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java
+++ b/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java
@@ -372,9 +372,10 @@ public class TechnicalSpecificationController {
      */
     @PostMapping(value="/searchBMRoute")
     @ResponseBody
-    public R searchBMRoute(@RequestBody SearchBMData data){
-        List<RoutingComponentVo> rows= technicalSpecificationService.searchBMRoute(data);
-        return R.ok().put("rows", rows);
+    public R searchBMRoute(@RequestBody PlmBmBomData data){
+        Map<String, Object> map= technicalSpecificationService.searchBMRoute(data);
+
+        return R.ok().put("rows", map.get("rows")).put("row", map.get("row"));
     }
     
     /**
diff --git a/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java b/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java
index 593ac2a8..bb7ee778 100644
--- a/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java
+++ b/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java
@@ -353,7 +353,7 @@ public interface TechnicalSpecificationMapper {
      * @return List<PlmBmRoutingDetailData>
      * @throw
      */
-    List<RoutingComponentVo> searchBMRoute(SearchBMData data);
+    List<RoutingComponentVo> searchBMRoute(RoutingDetailEntity data);
     
     /**
      * @Description TODO
@@ -1072,6 +1072,7 @@ public interface TechnicalSpecificationMapper {
     RoutingDetailEntity getTopOneRouteAlternativeNo(RoutingHeaderEntity inData);
 
     BomDetailEntity getBMBomDetail(PlmBmBomData inData);
+    RoutingDetailEntity getBMRouteDetail(PlmBmBomData inData);
     /**
      * @Description 更新benchmark bom版本
      * @Title updateBMBomRev
diff --git a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java
index db50b24f..2784900c 100644
--- a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java
+++ b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java
@@ -412,8 +412,13 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
     }
 
     @Override
-    public List<RoutingComponentVo> searchBMRoute(SearchBMData data){
-        return technicalSpecificationMapper.searchBMRoute(data);
+    public Map<String, Object> searchBMRoute(PlmBmBomData data){
+        HashMap<String, Object> map = new HashMap<>();
+        RoutingDetailEntity bomDetailEntity=technicalSpecificationMapper.getBMRouteDetail(data);
+        List<RoutingComponentVo> list= technicalSpecificationMapper.searchBMRoute(bomDetailEntity);
+        map.put("rows",list);
+        map.put("row",bomDetailEntity);
+        return map;
     }
 
     @Override
diff --git a/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java b/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java
index 31fa1a0a..e02ca3ac 100644
--- a/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java
+++ b/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java
@@ -303,7 +303,7 @@ public interface TechnicalSpecificationService {
      * @return List<PlmBmRoutingDetailData>
      * @throw
      */
-    List<RoutingComponentVo> searchBMRoute(SearchBMData data);
+    Map<String, Object>  searchBMRoute(PlmBmBomData data);
 
     /**
      * @Description TODO
diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
index 6d0cd025..cc5107f8 100644
--- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
+++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
@@ -298,7 +298,7 @@ a.wiRevison,a.wiDate,a.routingRemark,a.routingAction,
             note_text as componentNoteText,
             item_type
         FROM plm_routing_component
-        where site = '1' and part_no = '8001000002' and routing_type = 'Manufacturing' and routing_revision = 1 and alternative_no = '*'
+        where site = #{site} and part_no =#{partNo} and routing_type = #{routingType} and routing_revision = #{routingRevision,jdbcType=INTEGER} and alternative_no = #{alternativeNo}
         order by operation_no
 </select>
 
@@ -775,6 +775,13 @@ id
     from plm_technical_specification_sheet a left join plm_project_part b on a.site=b.site and a.test_part_no=b.test_part_no
     where a.site=#{site} and a.code_no=#{codeNo}
 </select>
+<select id="getBMRouteDetail" resultType="com.spring.modules.part.entity.RoutingDetailEntity">
+    select a.site,a.routing_type,a.routing_revision,
+a.routing_alternative_no alternativeNo,b.final_part_no  partNo
+    from plm_technical_specification_sheet a left join plm_project_part b on a.site=b.site and a.test_part_no=b.test_part_no
+    where a.site=#{site} and a.code_no=#{codeNo}
+</select>
+
 
 <select id="searchBMBomDetail" resultType="com.spring.modules.part.entity.BomDetailEntity">
     select a.site,a.part_no,a.alternative_no,a.alternative_description,a.bom_type,a.eng_chg_level,a.min_lot_qty,a.default_flag,