diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdReportController.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdReportController.java
index 55c371d0..837eaaa9 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdReportController.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdReportController.java
@@ -104,4 +104,22 @@ public class ProdReportController extends BaseController {
         return R.ok(vos);
     }
 
+    /**
+     * 良率汇总（按机台）
+     */
+    @GetMapping("/yieldSummaryByMachine")
+    public R<List<HashMap<String, Object>>> yieldSummaryByMachine(@RequestParam(required = false) Map hashMap) {
+        List<HashMap<String, Object>> vos = prodReportService.yieldSummaryByMachine(hashMap);
+        return R.ok(vos);
+    }
+
+    /**
+     * 良率趋势（日维度）
+     */
+    @GetMapping("/yieldTrendByDate")
+    public R<List<HashMap<String, Object>>> yieldTrendByDate(@RequestParam(required = false) Map hashMap) {
+        List<HashMap<String, Object>> vos = prodReportService.yieldTrendByDate(hashMap);
+        return R.ok(vos);
+    }
+
 }
diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdReportMapper.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdReportMapper.java
index 2c572c28..4e01412a 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdReportMapper.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdReportMapper.java
@@ -62,4 +62,18 @@ public interface ProdReportMapper {
      */
     List<HashMap<String, Object>> designDailyOutputInformation(@Param("map") Map hashMap, @Param("tableName") String tableName);
 
+    /**
+     * 良率汇总（按机台）
+     * @param hashMap 查询条件
+     * @return 列表
+     */
+    List<HashMap<String, Object>> yieldSummaryByMachine(@Param("map") Map hashMap);
+
+    /**
+     * 良率趋势（日维度）
+     * @param hashMap 查询条件
+     * @return 列表
+     */
+    List<HashMap<String, Object>> yieldTrendByDate(@Param("map") Map hashMap);
+
 }
diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdReportService.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdReportService.java
index c1630dec..1282caed 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdReportService.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdReportService.java
@@ -58,4 +58,17 @@ public interface IProdReportService {
      */
     List<HashMap<String, Object>> designDailyOutputInformation(Map hashMap);
 
-}
+   /**
+    * 良率汇总（按机台）
+  * @param hashMap 查询条件
+    * @return 列表     */
+    List<HashMap<String, Object>> yieldSummaryByMachine(Map hashMap);
+
+    /**
+    * 良率趋势（日维度）
+    * @param hashMap 查询条件
+    * @return 列表
+    */
+    List<HashMap<String, Object>> yieldTrendByDate(Map hashMap);
+
+ }
diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdReportServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdReportServiceImpl.java
index bb62ecea..07654f3d 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdReportServiceImpl.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdReportServiceImpl.java
@@ -131,4 +131,20 @@ public class ProdReportServiceImpl implements IProdReportService {
         return prodReportMapper.designDailyOutputInformation(hashMap, tableName);
     }
 
+    /**
+     * 良率汇总（按机台）
+     */
+    @Override
+    public List<HashMap<String, Object>> yieldSummaryByMachine(Map hashMap) {
+        return prodReportMapper.yieldSummaryByMachine(hashMap);
+    }
+
+    /**
+     * 良率趋势（日维度）
+     */
+    @Override
+    public List<HashMap<String, Object>> yieldTrendByDate(Map hashMap) {
+        return prodReportMapper.yieldTrendByDate(hashMap);
+    }
+
 }
diff --git a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdReportMapper.xml b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdReportMapper.xml
index 0164766d..1bb9e8b7 100644
--- a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdReportMapper.xml
+++ b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdReportMapper.xml
@@ -117,4 +117,62 @@
         ORDER BY productionDate
     </select>
 
+    <select id="yieldSummaryByMachine" resultType="java.util.HashMap">
+        SELECT bm.machine_name AS machineName,
+               COUNT(1) AS totalCount,
+               SUM(CASE WHEN (UPPER(t.scan_result) IN ('OK','PASS') OR t.scan_result IN (N'通过')) THEN 1 ELSE 0 END) AS okCount,
+               SUM(CASE WHEN t.scan_result IS NULL THEN 0 WHEN (UPPER(t.scan_result) IN ('OK','PASS') OR t.scan_result IN (N'通过')) THEN 0 ELSE 1 END) AS ngCount,
+               CAST(IIF(COUNT(1) = 0, 0, (SUM(CASE WHEN (UPPER(t.scan_result) IN ('OK','PASS') OR t.scan_result IN (N'通过')) THEN 1 ELSE 0 END) * 100.0 / COUNT(1))) AS DECIMAL(10,2)) AS yieldRateNum,
+               CONCAT(CAST(IIF(COUNT(1) = 0, 0, (SUM(CASE WHEN (UPPER(t.scan_result) IN ('OK','PASS') OR t.scan_result IN (N'通过')) THEN 1 ELSE 0 END) * 100.0 / COUNT(1))) AS DECIMAL(10,2)), '%') AS yieldRate
+        FROM prod_output_scan_info t
+        LEFT JOIN prod_base_machine_info bm ON bm.machine_id = t.machine_id
+        LEFT JOIN prod_base_process_info pi ON pi.process_id = t.process_id
+        LEFT JOIN base_material_info bmi ON bmi.material_id = t.materiel_id
+        <where>
+            <if test="map.beginDate != null  and map.beginDate != '' and map.endDate != null  and map.endDate != ''">
+                AND FORMAT(t.create_time, 'yyyy-MM-dd') BETWEEN #{map.beginDate} AND #{map.endDate}
+            </if>
+            <if test="map.processId != null and map.processId != ''">
+                AND t.process_id = #{map.processId}
+            </if>
+            <if test="map.machineId != null and map.machineId != ''">
+                AND t.machine_id = #{map.machineId}
+            </if>
+            <if test="map.materialName != null and map.materialName != ''">
+                AND bmi.material_name LIKE CONCAT('%', #{map.materialName}, '%')
+            </if>
+        </where>
+        GROUP BY bm.machine_name
+        ORDER BY yieldRateNum DESC, machineName
+    </select>
+
+    <select id="yieldTrendByDate" resultType="java.util.HashMap">
+        SELECT CONVERT(DATE, t.create_time) AS productionDate,
+               COUNT(1) AS totalCount,
+               SUM(CASE WHEN (UPPER(t.scan_result) IN ('OK','PASS') OR t.scan_result IN (N'通过')) THEN 1 ELSE 0 END) AS okCount,
+               SUM(CASE WHEN t.scan_result IS NULL THEN 0 WHEN (UPPER(t.scan_result) IN ('OK','PASS') OR t.scan_result IN (N'通过')) THEN 0 ELSE 1 END) AS ngCount,
+               CAST(IIF(COUNT(1) = 0, 0, (SUM(CASE WHEN (UPPER(t.scan_result) IN ('OK','PASS') OR t.scan_result IN (N'通过')) THEN 1 ELSE 0 END) * 100.0 / COUNT(1))) AS DECIMAL(10,2)) AS yieldRateNum,
+               CONCAT(CAST(IIF(COUNT(1) = 0, 0, (SUM(CASE WHEN (UPPER(t.scan_result) IN ('OK','PASS') OR t.scan_result IN (N'通过')) THEN 1 ELSE 0 END) * 100.0 / COUNT(1))) AS DECIMAL(10,2)), '%') AS yieldRate
+        FROM prod_output_scan_info t
+        LEFT JOIN prod_base_machine_info bm ON bm.machine_id = t.machine_id
+        LEFT JOIN prod_base_process_info pi ON pi.process_id = t.process_id
+        LEFT JOIN base_material_info bmi ON bmi.material_id = t.materiel_id
+        <where>
+            <if test="map.beginDate != null  and map.beginDate != '' and map.endDate != null  and map.endDate != ''">
+                AND FORMAT(t.create_time, 'yyyy-MM-dd') BETWEEN #{map.beginDate} AND #{map.endDate}
+            </if>
+            <if test="map.processId != null and map.processId != ''">
+                AND t.process_id = #{map.processId}
+            </if>
+            <if test="map.machineId != null and map.machineId != ''">
+                AND t.machine_id = #{map.machineId}
+            </if>
+            <if test="map.materialName != null and map.materialName != ''">
+                AND bmi.material_name LIKE CONCAT('%', #{map.materialName}, '%')
+            </if>
+        </where>
+        GROUP BY CONVERT(DATE, t.create_time)
+        ORDER BY productionDate
+    </select>
+
 </mapper>