From cb2361f62c457f6ea399442712eb37cb3b5c88e6 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 14 Nov 2024 10:26:50 +0800
Subject: [PATCH] 2024-11-14

---
 .../impl/BomManagementServiceImpl.java        |  2 +-
 .../impl/PartInformationServiceImpl.java      |  8 +--
 .../sys/modules/part/vo/BomComponentVo.java   |  1 +
 .../sys/modules/part/vo/BomHeaderVo.java      |  4 ++
 .../mapper/part/BomManagementMapper.xml       | 50 +++++++++++--------
 .../mapper/part/RoutingManagementMapper.xml   | 12 ++---
 6 files changed, 44 insertions(+), 33 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/part/service/impl/BomManagementServiceImpl.java b/src/main/java/com/xujie/sys/modules/part/service/impl/BomManagementServiceImpl.java
index 9ed3e571..e416fc14 100644
--- a/src/main/java/com/xujie/sys/modules/part/service/impl/BomManagementServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/part/service/impl/BomManagementServiceImpl.java
@@ -869,7 +869,7 @@ public class BomManagementServiceImpl extends ServiceImpl<BomManagementMapper, B
                 task.setPrintUnit(partInformationEntity.getUmId()); // 单位
                 task.setQtyPerAssembly(getNumericCellValueOrDefault(row, 2, BigDecimal.ZERO)); // 单位用量
                 task.setComponentScrap(getNumericCellValueOrDefault(row, 3, BigDecimal.ZERO)); // 调机量
-                task.setShrinkageFactor(getNumericCellValueOrDefault(row, 4, BigDecimal.ZERO)); // 损耗率
+                task.setShrinkageFactor(data.getShrinkageFactor()); // 损耗率
                 saveList.add(task);
             }
             // 新增bom子明细物料
diff --git a/src/main/java/com/xujie/sys/modules/part/service/impl/PartInformationServiceImpl.java b/src/main/java/com/xujie/sys/modules/part/service/impl/PartInformationServiceImpl.java
index 18ec9edf..6dfa2117 100644
--- a/src/main/java/com/xujie/sys/modules/part/service/impl/PartInformationServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/part/service/impl/PartInformationServiceImpl.java
@@ -204,7 +204,7 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         String site = inData.getSite();
         String buNo = inData.getBuNo();
         String partNo = inData.getPartNo();
-        String umId = inData.getUmId() == null ? "" : inData.getUmId();
+        String umId2 = inData.getUmId2() == null ? "" : inData.getUmId2();
         String familyId = inData.getFamilyID() == null ? "" : inData.getFamilyID();
         String productGroupId1 = inData.getOtherGroup1() == null ? "" : inData.getOtherGroup1();
         String productGroupId2 = inData.getOtherGroup2() == null ? "" : inData.getOtherGroup2();
@@ -214,7 +214,7 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         params.add(site);
         params.add(buNo);
         params.add(partNo);
-        params.add(umId);
+        params.add(umId2);
         params.add(familyId);
         params.add(productGroupId1);
         params.add(productGroupId2);
@@ -284,7 +284,7 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         String site = inData.getSite();
         String buNo = inData.getBuNo();
         String partNo = inData.getPartNo();
-        String umId = inData.getUmId() == null ? "" : inData.getUmId();
+        String umId2 = inData.getUmId2() == null ? "" : inData.getUmId2();
         String familyId = inData.getFamilyID() == null ? "" : inData.getFamilyID();
         String productGroupId1 = inData.getOtherGroup1() == null ? "" : inData.getOtherGroup1();
         String productGroupId2 = inData.getOtherGroup2() == null ? "" : inData.getOtherGroup2();
@@ -294,7 +294,7 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         params.add(site);
         params.add(buNo);
         params.add(partNo);
-        params.add(umId);
+        params.add(umId2);
         params.add(familyId);
         params.add(productGroupId1);
         params.add(productGroupId2);
diff --git a/src/main/java/com/xujie/sys/modules/part/vo/BomComponentVo.java b/src/main/java/com/xujie/sys/modules/part/vo/BomComponentVo.java
index 83d30920..68c424e2 100644
--- a/src/main/java/com/xujie/sys/modules/part/vo/BomComponentVo.java
+++ b/src/main/java/com/xujie/sys/modules/part/vo/BomComponentVo.java
@@ -3,6 +3,7 @@ package com.xujie.sys.modules.part.vo;
 import com.xujie.sys.modules.part.entity.BomAllFieldEntity;
 import com.xujie.sys.modules.part.entity.BomComponentEntity;
 import lombok.Data;
+import org.apache.poi.hpsf.Decimal;
 
 import java.util.List;
 
diff --git a/src/main/java/com/xujie/sys/modules/part/vo/BomHeaderVo.java b/src/main/java/com/xujie/sys/modules/part/vo/BomHeaderVo.java
index f996d28b..a67d6eb3 100644
--- a/src/main/java/com/xujie/sys/modules/part/vo/BomHeaderVo.java
+++ b/src/main/java/com/xujie/sys/modules/part/vo/BomHeaderVo.java
@@ -3,6 +3,8 @@ package com.xujie.sys.modules.part.vo;
 import com.xujie.sys.modules.part.entity.BomHeaderEntity;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 public class BomHeaderVo extends BomHeaderEntity {
 
@@ -39,4 +41,6 @@ public class BomHeaderVo extends BomHeaderEntity {
     private String userName;
 
     private String alternativeNo;
+
+    private BigDecimal yieldRate;
 }
diff --git a/src/main/resources/mapper/part/BomManagementMapper.xml b/src/main/resources/mapper/part/BomManagementMapper.xml
index 40a0de5c..f56122ea 100644
--- a/src/main/resources/mapper/part/BomManagementMapper.xml
+++ b/src/main/resources/mapper/part/BomManagementMapper.xml
@@ -22,13 +22,16 @@
             a.create_by,
             a.update_date,
             a.update_by,
-            b.umid as printUnit,
-            dbo.qc_get_um_name(a.site, b.umid) as printUnitName
+            b.umid2 as printUnit,
+            dbo.qc_get_um_name(a.site, b.umid2) as printUnitName,
+            isnull(c.yield_rate, 100) as yieldRate
         FROM plm_bom_header as a
         left join part as b on a.site = b.site and a.bu_no = b.sourceBu and a.part_no = b.part_no
+        left join part_product_group as c on b.site = c.site and b.sourceBu = c.bu_no and b.product_group_id2 = c.product_group_id
         <where>
             a.site in (select site from eam_access_site where username = #{query.userName})
             and (a.site + '-' + a.bu_no) in (select * from dbo.query_bu(#{query.userName}))
+            and c.type = '2'
             <if test="query.buNo != null and query.buNo != ''">
                 AND a.bu_no = #{query.buNo}
             </if>
@@ -55,8 +58,8 @@
         part_no,
         part_desc,
         spec,
-        umid as printUnit,
-        dbo.qc_get_um_name(site, umid) as printUnitName,
+        umid2 as printUnit,
+        dbo.qc_get_um_name(site, umid2) as printUnitName,
         part_type2,
         case when part_type2 = 'Manufactured' then '成品' when part_type2 = 'Manufactured Recipe' then '半成品' when part_type2 = 'Purchased (raw)' then '原材料' end as partType2Desc,
         FamilyID,
@@ -84,8 +87,8 @@
         part_no,
         part_desc,
         spec,
-        umid as printUnit,
-        dbo.qc_get_um_name(site, umid) as printUnitName,
+        umid2 as printUnit,
+        dbo.qc_get_um_name(site, umid2) as printUnitName,
         part_type2,
         case when part_type2 = 'Manufactured' then '成品' when part_type2 = 'Manufactured Recipe' then '半成品' when part_type2 = 'Purchased (raw)' then '原材料' end as partType2Desc,
         FamilyID,
@@ -294,20 +297,23 @@
     <!-- bom主表查重 -->
     <select id="checkBomOnlyOne" parameterType="BomAllFieldEntity" resultType="com.xujie.sys.modules.part.vo.BomHeaderVo">
         SELECT
-            site,
-            bu_no,
-            part_no,
-            dbo.qc_get_part_desc(site, bu_no, part_no) as partDesc,
-            bom_type,
-            eng_chg_level,
-            eff_phase_in_date,
-            eff_phase_out_date,
-            eng_revision,
-            type_flag,
-            net_weight,
-            note_text
-        FROM plm_bom_header
-        where site = #{site} and bu_no = #{buNo} and part_no = #{partNo} and bom_type = #{bomType} and eng_chg_level = #{engChgLevel}
+            a.site,
+            a.bu_no,
+            a.part_no,
+            dbo.qc_get_part_desc(a.site, a.bu_no, a.part_no) as partDesc,
+            a.bom_type,
+            a.eng_chg_level,
+            a.eff_phase_in_date,
+            a.eff_phase_out_date,
+            a.eng_revision,
+            a.type_flag,
+            a.net_weight,
+            a.note_text,
+            isnull(c.yield_rate, 0) as yieldRate
+        FROM plm_bom_header as a
+        left join part as b on a.site = b.site and a.bu_no = b.sourceBu and a.part_no = b.part_no
+        left join part_product_group as c on b.site = c.site and b.sourceBu = c.bu_no and b.product_group_id2 = c.product_group_id
+        where a.site = #{site} and a.bu_no = #{buNo} and a.part_no = #{partNo} and a.bom_type = #{bomType} and a.eng_chg_level = #{engChgLevel} and c.type = '2'
     </select>
 
     <!-- bom明细查重 -->
@@ -583,8 +589,8 @@
         part_no,
         part_desc,
         spec,
-        umid as printUnit,
-        dbo.qc_get_um_name(site, umid) as printUnitName,
+        umid2 as printUnit,
+        dbo.qc_get_um_name(site, umid2) as printUnitName,
         part_type2,
         case when part_type2 = 'Manufactured' then '成品' when part_type2 = 'Manufactured Recipe' then '半成品' when part_type2 = 'Purchased (raw)' then '原材料' end as partType2Desc,
         FamilyID,
diff --git a/src/main/resources/mapper/part/RoutingManagementMapper.xml b/src/main/resources/mapper/part/RoutingManagementMapper.xml
index 220b2e38..12d0ed72 100644
--- a/src/main/resources/mapper/part/RoutingManagementMapper.xml
+++ b/src/main/resources/mapper/part/RoutingManagementMapper.xml
@@ -19,8 +19,8 @@
             a.create_by,
             a.update_date,
             a.update_by,
-            b.umid as printUnit,
-            dbo.qc_get_um_name(a.site, b.umid) as printUnitName
+            b.umid2 as printUnit,
+            dbo.qc_get_um_name(a.site, b.umid2) as printUnitName
         FROM plm_routing_header as a
         left join part as b on a.site = b.site and a.bu_no = b.sourceBu and a.part_no = b.part_no
         <where>
@@ -52,8 +52,8 @@
         part_no,
         part_desc,
         spec,
-        umid as printUnit,
-        dbo.qc_get_um_name(site, umid) as printUnitName,
+        umid2 as printUnit,
+        dbo.qc_get_um_name(site, umid2) as printUnitName,
         part_type2,
         case when part_type2 = 'Manufactured' then '成品' when part_type2 = 'Manufactured Recipe' then '半成品' when part_type2 = 'Purchased (raw)' then '原材料' end as partType2Desc
         FROM part
@@ -79,8 +79,8 @@
         part_no,
         part_desc,
         spec,
-        umid as printUnit,
-        dbo.qc_get_um_name(site, umid) as printUnitName,
+        umid2 as printUnit,
+        dbo.qc_get_um_name(site, umid2) as printUnitName,
         part_type2,
         case when part_type2 = 'Manufactured' then '成品' when part_type2 = 'Manufactured Recipe' then '半成品' when part_type2 = 'Purchased (raw)' then '原材料' end as partType2Desc
         FROM part