From 893b1c4c31826a4dd002843ebb1b35cbba92ef39 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 14 Nov 2024 11:34:13 +0800
Subject: [PATCH] 2024-11-14

---
 .../part/entity/BomAllFieldEntity.java        |  2 +
 .../mapper/part/BomManagementMapper.xml       | 72 +++++++++----------
 2 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/part/entity/BomAllFieldEntity.java b/src/main/java/com/xujie/sys/modules/part/entity/BomAllFieldEntity.java
index 72ad2cf6..37078822 100644
--- a/src/main/java/com/xujie/sys/modules/part/entity/BomAllFieldEntity.java
+++ b/src/main/java/com/xujie/sys/modules/part/entity/BomAllFieldEntity.java
@@ -193,4 +193,6 @@ public class BomAllFieldEntity extends QueryPage {
 
     private String partType2;
     private String partType2Desc;
+
+    private BigDecimal yieldRate;
 }
diff --git a/src/main/resources/mapper/part/BomManagementMapper.xml b/src/main/resources/mapper/part/BomManagementMapper.xml
index 916747c9..0ea461f2 100644
--- a/src/main/resources/mapper/part/BomManagementMapper.xml
+++ b/src/main/resources/mapper/part/BomManagementMapper.xml
@@ -53,28 +53,28 @@
     <!-- 查询物料清单 -->
     <select id="queryPartList" parameterType="ComponentPartData" resultType="BomAllFieldEntity">
         SELECT
-        site,
-        sourceBu as buNo,
-        part_no,
-        part_desc,
-        spec,
-        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,
-        dbo.get_family_name(site, sourceBu, FamilyID) as familyName
-        FROM part
+        a.site,
+        a.sourceBu as buNo,
+        a.part_no,
+        a.part_desc,
+        a.spec,
+        a.umid2 as printUnit,
+        dbo.qc_get_um_name(a.site, a.umid2) as printUnitName,
+        a.part_type2,
+        case when a.part_type2 = 'Manufactured' then '成品' when a.part_type2 = 'Manufactured Recipe' then '半成品' when a.part_type2 = 'Purchased (raw)' then '原材料' end as partType2Desc,
+        a.FamilyID,
+        dbo.get_family_name(a.site, a.sourceBu, a.FamilyID) as familyName,
+        isnull(b.yield_rate, 100) as yieldRate
+        FROM part as a
+        left join part_product_group as b on a.site = b.site and a.sourceBu = b.bu_no and a.product_group_id2 = b.product_group_id
         <where>
-            site = #{query.site}
-            and sourceBu = #{query.buNo}
-            and (part_type2 <![CDATA[<>]]> 'Purchased (raw)' or part_type2 is null)
-            and active = 'Y'
+            a.site = #{query.site} and a.sourceBu = #{query.buNo} and a.active = 'Y' and b.type = '2'
+            and (a.part_type2 <![CDATA[<>]]> 'Purchased (raw)' or a.part_type2 is null)
             <if test = "query.partNo != null and query.partNo != ''">
-                AND part_no like '%' + #{query.partNo} + '%'
+                AND a.part_no like '%' + #{query.partNo} + '%'
             </if>
             <if test = "query.partDesc != null and query.partDesc != ''">
-                AND part_desc like '%' +  #{query.partDesc} + '%'
+                AND a.part_desc like '%' +  #{query.partDesc} + '%'
             </if>
         </where>
     </select>
@@ -82,28 +82,28 @@
     <!-- 查出可创建BOM的物料 -->
     <select id="queryPartListBom" parameterType="ComponentPartData" resultType="BomAllFieldEntity">
         SELECT
-        site,
-        sourceBu as buNo,
-        part_no,
-        part_desc,
-        spec,
-        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,
-        dbo.get_family_name(site, sourceBu, FamilyID) as familyName
-        FROM part
+        a.site,
+        a.sourceBu as buNo,
+        a.part_no,
+        a.part_desc,
+        a.spec,
+        a.umid2 as printUnit,
+        dbo.qc_get_um_name(a.site, a.umid2) as printUnitName,
+        a.part_type2,
+        case when a.part_type2 = 'Manufactured' then '成品' when a.part_type2 = 'Manufactured Recipe' then '半成品' when a.part_type2 = 'Purchased (raw)' then '原材料' end as partType2Desc,
+        a.FamilyID,
+        dbo.get_family_name(a.site, a.sourceBu, a.FamilyID) as familyName,
+        isnull(b.yield_rate, 100) as yieldRate
+        FROM part as a
+        left join part_product_group as b on a.site = b.site and a.sourceBu = b.bu_no and a.product_group_id2 = b.product_group_id
         <where>
-            site = #{query.site}
-            and sourceBu = #{query.buNo}
-            and active = 'Y'
-            and (part_type2 <![CDATA[<>]]> 'Purchased (raw)' or part_type2 is null)
+            a.site = #{query.site} and a.sourceBu = #{query.buNo} and a.active = 'Y' and b.type = '2'
+            and (a.part_type2 <![CDATA[<>]]> 'Purchased (raw)' or a.part_type2 is null)
             <if test = "query.partNo != null and query.partNo != ''">
-                AND part_no like '%' + #{query.partNo} + '%'
+                AND a.part_no like '%' + #{query.partNo} + '%'
             </if>
             <if test = "query.partDesc != null and query.partDesc != ''">
-                AND part_desc like '%' +  #{query.partDesc} + '%'
+                AND a.part_desc like '%' +  #{query.partDesc} + '%'
             </if>
         </where>
     </select>