From 0d404a4612541868a00f5437724ae3643d5baa4b Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Mon, 18 Mar 2024 13:51:22 +0800
Subject: [PATCH] 1127

---
 .../quotation/entity/QuoteRoutingDetail.java  |  4 --
 .../quotation/vo/QuoteRoutingDetailVo.java    |  4 ++
 .../quotation/QuoteRoutingHeaderMapper.xml    |  3 +-
 .../TechnicalSpecificationMapper.xml          | 56 ++++++++++---------
 4 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/src/main/java/com/spring/modules/quotation/entity/QuoteRoutingDetail.java b/src/main/java/com/spring/modules/quotation/entity/QuoteRoutingDetail.java
index e6d5f62a..f0938cd7 100644
--- a/src/main/java/com/spring/modules/quotation/entity/QuoteRoutingDetail.java
+++ b/src/main/java/com/spring/modules/quotation/entity/QuoteRoutingDetail.java
@@ -128,8 +128,4 @@ public class QuoteRoutingDetail {
      */
     private Integer operationId;
 
-    /**
-     *
-     */
-    private String itemType;
 }
\ No newline at end of file
diff --git a/src/main/java/com/spring/modules/quotation/vo/QuoteRoutingDetailVo.java b/src/main/java/com/spring/modules/quotation/vo/QuoteRoutingDetailVo.java
index 7f7f6529..5c942115 100644
--- a/src/main/java/com/spring/modules/quotation/vo/QuoteRoutingDetailVo.java
+++ b/src/main/java/com/spring/modules/quotation/vo/QuoteRoutingDetailVo.java
@@ -53,4 +53,8 @@ public class QuoteRoutingDetailVo extends QuoteRoutingDetail {
      * 单位报价成本
      */
     private BigDecimal quoteUnitCost;
+    /**
+     * benchMark组件号
+     */
+    private String itemType;
 }
diff --git a/src/main/resources/mapper/quotation/QuoteRoutingHeaderMapper.xml b/src/main/resources/mapper/quotation/QuoteRoutingHeaderMapper.xml
index 24ee37c8..80ee66d3 100644
--- a/src/main/resources/mapper/quotation/QuoteRoutingHeaderMapper.xml
+++ b/src/main/resources/mapper/quotation/QuoteRoutingHeaderMapper.xml
@@ -26,8 +26,7 @@
                overlap,
                note_text,
                operation_name,
-               operation_id,
-               item_type
+               operation_id
         from plm_routing_component
            where site = #{site}
            and part_no = #{partNo}
diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
index ec858833..d2422720 100644
--- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
+++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
@@ -281,33 +281,35 @@ a.wiRevison,a.wiDate,a.routingRemark,a.routingAction,
 
 <select id="searchBMRoute" resultType="com.spring.modules.part.vo.RoutingComponentVo">
      SELECT
-            site,
-            part_no,
-            routing_type,
-            routing_revision,
-            alternative_no,
-            operation_id,
-            operation_no,
-            operation_name,
-            efficiency_factor,
-            mach_run_factor,
-            mach_setup_time,
-            run_time_code,
-            labor_run_factor,
-            labor_setup_time,
-            crew_size,
-            setup_crew_size,
-            outside_op_item,
-            machine_no,
-            work_center_no,
-            dbo.get_workCenter_desc(site, work_center_no) as workCenterDesc,
-            labor_class_no,
-            setup_labor_class_no,
-            overlap,
-            note_text as componentNoteText,
-            item_type
-        FROM plm_routing_component
-        where site = #{site} and part_no =#{partNo} and routing_type = #{routingType} and routing_revision = #{routingRevision,jdbcType=INTEGER} and alternative_no = #{alternativeNo}
+            a.site,
+            a.part_no,
+            a.routing_type,
+            a.routing_revision,
+            a.alternative_no,
+            a.operation_id,
+            a.operation_no,
+            a.operation_name,
+            a.efficiency_factor,
+            a.mach_run_factor,
+            a.mach_setup_time,
+            a.run_time_code,
+            a.labor_run_factor,
+            a.labor_setup_time,
+            a.crew_size,
+            a.setup_crew_size,
+            a.outside_op_item,
+            a.machine_no,
+            a.work_center_no,
+            dbo.get_workCenter_desc(a.site, a.work_center_no) as workCenterDesc,
+            a.labor_class_no,
+            a.setup_labor_class_no,
+            a.overlap,
+            a.note_text as componentNoteText,
+            b.itemType
+
+        FROM plm_routing_component a
+        left join WorkCenter_BMType b on a.site=b.site and a.work_center_no=b.workCenterNo
+        where a.site = #{site} and a.part_no =#{partNo} and a.routing_type = #{routingType} and a.routing_revision = #{routingRevision,jdbcType=INTEGER} and a.alternative_no = #{alternativeNo}
         order by operation_no
 </select>