From cd82702b0bcbb3b46caa0095c47fd8ba9884b3b0 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 25 Sep 2024 13:05:15 +0800
Subject: [PATCH] =?UTF-8?q?2024-09-25=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

---
 .../modules/part/vo/RoutingComponentVo.java   |  4 ++
 .../mapper/part/RoutingManagementMapper.xml   | 72 ++++++++++---------
 2 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/part/vo/RoutingComponentVo.java b/src/main/java/com/xujie/sys/modules/part/vo/RoutingComponentVo.java
index 9f114884..cb589545 100644
--- a/src/main/java/com/xujie/sys/modules/part/vo/RoutingComponentVo.java
+++ b/src/main/java/com/xujie/sys/modules/part/vo/RoutingComponentVo.java
@@ -13,6 +13,10 @@ public class RoutingComponentVo extends RoutingComponentEntity {
      * 加工中心名称
      **/
     private String workCenterDesc;
+    /**
+     * 加工中心类型
+     */
+    private String workCenterType;
     /**
      * 物料名称
      **/
diff --git a/src/main/resources/mapper/part/RoutingManagementMapper.xml b/src/main/resources/mapper/part/RoutingManagementMapper.xml
index 30e415c6..08cb0795 100644
--- a/src/main/resources/mapper/part/RoutingManagementMapper.xml
+++ b/src/main/resources/mapper/part/RoutingManagementMapper.xml
@@ -166,42 +166,44 @@
     <!-- 查routing子明细 -->
     <select id="queryRoutingComponent" parameterType="RoutingDetailEntity" resultType="com.xujie.sys.modules.part.vo.RoutingComponentVo">
         SELECT
-            site,
-            bu_no,
-            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,
-            case when run_time_code = 'Units/Hour' then '单位/小时'
-                 when run_time_code = 'Hours/Unit' then '小时/单位'
-                 when run_time_code = 'Hours' then '小时'
+            a.site,
+            a.bu_no,
+            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,
+            case when a.run_time_code = 'Units/Hour' then '单位/小时'
+                 when a.run_time_code = 'Hours/Unit' then '小时/单位'
+                 when a.run_time_code = 'Hours' then '小时'
                  else '' end as runTimeCodeDesc,
-            labor_run_factor,
-            labor_setup_time,
-            crew_size,
-            setup_crew_size,
-            outside_op_item,
-            machine_no,
-            work_center_no,
-            dbo.get_workCenter_desc(site, bu_no, work_center_no) as workCenterDesc,
-            labor_class_no,
-            dbo.get_labor_class_desc(site, bu_no, labor_class_no) as laborClassDesc,
-            setup_labor_class_no,
-            dbo.get_labor_class_desc(site, bu_no, setup_labor_class_no) as setupLaborClassDesc,
-            overlap,
-            note_text,
-            mach_cycle_time,
-            labor_cycle_time
-        FROM plm_routing_component
-        where site = #{site} and bu_no = #{buNo} and part_no = #{partNo} and routing_type = #{routingType} and routing_revision = #{routingRevision} and alternative_no = #{alternativeNo}
-        order by operation_no
+            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,
+            b.work_center_desc,
+            b.work_center_type,
+            a.labor_class_no,
+            dbo.get_labor_class_desc(a.site, a.bu_no, a.labor_class_no) as laborClassDesc,
+            a.setup_labor_class_no,
+            dbo.get_labor_class_desc(a.site, a.bu_no, a.setup_labor_class_no) as setupLaborClassDesc,
+            a.overlap,
+            a.note_text,
+            a.mach_cycle_time,
+            a.labor_cycle_time
+        FROM plm_routing_component as a
+        LEFT JOIN work_center as b on a.site = b.site and a.bu_no = b.bu_no and a.work_center_no = b.work_center_no
+        where a.site = #{site} and a.bu_no = #{buNo} and a.part_no = #{partNo} and a.routing_type = #{routingType} and a.routing_revision = #{routingRevision} and a.alternative_no = #{alternativeNo}
+        order by a.operation_no
     </select>
 
     <!-- routing主表编辑 -->