2025-03-04

优化

src/main/java/com/xujie/sys/modules/part/vo/BomHeaderVo.java

@@ -52,4 +52,16 @@ public class BomHeaderVo extends BomHeaderEntity {
     private String partType2;
     private String partType2Desc;
     private String mainPart;
+    /**
+     * 是否可用中文描述
+     */
+    private String activeDesc;
+    /**
+     * 创建人中文描述
+     */
+    private String createByDesc;
+    /**
+     * 更新人中文描述
+     */
+    private String updateByDesc;
 }

src/main/java/com/xujie/sys/modules/part/vo/PartProductGroupInformationVo.java

@@ -24,4 +24,16 @@ public class PartProductGroupInformationVo extends PartProductGroupInformationEn
      *
      */
     private String userName;
+    /**
+     * 是否可用中文描述
+     */
+    private String activeDesc;
+    /**
+     * 创建人中文描述
+     */
+    private String createByDesc;
+    /**
+     * 更新人中文描述
+     */
+    private String updateByDesc;
 }

src/main/java/com/xujie/sys/modules/part/vo/RoutingHeaderVo.java

@@ -44,4 +44,12 @@ public class RoutingHeaderVo extends RoutingHeaderEntity {
     private String nodeId;
 
     private String offFlag;
+    /**
+     * 创建人中文描述
+     */
+    private String createByDesc;
+    /**
+     * 更新人中文描述
+     */
+    private String updateByDesc;
 }

src/main/resources/mapper/part/BomManagementMapper.xml

@@ -20,8 +20,10 @@
             a.net_weight,
             a.create_date,
             a.create_by,
+            dbo.getOperatorDesc(a.site, a.create_by) as createByDesc,
             a.update_date,
             a.update_by,
+            dbo.getOperatorDesc(a.site, a.update_by) as updateByDesc,
             b.umid2 as printUnit,
             dbo.qc_get_um_name(a.site, b.umid2) as printUnitName,
             isnull(dbo.get_yield_rate(a.site, a.bu_no, b.product_group_id2, '2'), 100) as yieldRate,

src/main/resources/mapper/part/BomSearch3Mapper.xml

@@ -19,8 +19,10 @@
             a.net_weight,
             a.create_date,
             a.create_by,
+            dbo.getOperatorDesc(a.site, a.create_by) as createByDesc,
             a.update_date,
             a.update_by,
+            dbo.getOperatorDesc(a.site, a.update_by) as updateByDesc,
             b.umid2 as printUnit,
             c.UMName as printUnitName,
             b.part_type2,
@@ -53,7 +55,7 @@
     </select>
 
     <!-- 查bom明细 -->
-    <select id="getAlternativeTree" parameterType="com.xujie.sys.modules.part.vo.BomHeaderVo" resultType="BomComponentEntity">
+    <select id="getAlternativeTree" parameterType="com.xujie.sys.modules.part.vo.BomHeaderVo" resultType="com.xujie.sys.modules.part.entity.BomComponentEntity">
         SELECT
             a.site,
             a.bu_no,

src/main/resources/mapper/part/PartProductGroupInformationMapper.xml

@@ -11,11 +11,14 @@
             product_group_id,
             product_group_name,
             active,
+            case when active = 'Y' then '是' when active = 'N' then '否' else '' end as activeDesc,
             type,
             create_by,
             create_date,
-            update_by,
+            dbo.getOperatorDesc(site, create_by) as createByDesc,
             update_date,
+            update_by,
+            dbo.getOperatorDesc(site, update_by) as updateByDesc,
             yield_rate
         FROM part_product_group
         <where>

src/main/resources/mapper/part/RoutingManagementMapper.xml

@@ -17,8 +17,10 @@
             a.phase_out_date,
             a.create_date,
             a.create_by,
+            dbo.getOperatorDesc(a.site, a.create_by) as createByDesc,
             a.update_date,
             a.update_by,
+            dbo.getOperatorDesc(a.site, a.update_by) as updateByDesc,
             b.umid2 as printUnit,
             dbo.qc_get_um_name(a.site, b.umid2) as printUnitName
         FROM plm_routing_header as a