diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml
index d5a10f05..1f14bd62 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml
@@ -312,5 +312,159 @@
         start_time
     </select>
 
+    <select id="qualityAnalysis" resultType="java.util.Map">
+        select COUNT(pdm_produce_workorder.workprocedure_id) order_count,
+        pdm_produce_workorder.workprocedure_id,
+        YEAR(pdm_produce_workorder.create_time) '4',
+        DATE_FORMAT(pdm_produce_workorder.create_time,'%Y-%m') '3',
+        CONCAT(YEAR(pdm_produce_workorder.create_time),"_",WEEK(pdm_produce_workorder.create_time)) '2',
+        DATE_FORMAT(pdm_produce_workorder.create_time,'%Y-%m-%d') '1',
+        sum(plan_qty) plan_qty,
+        SUM(real_qty) real_qty,
+        SUM(nok_qty) nok_qty,
+        IF( SUM(real_qty) > 0, sum( nok_qty )*100 / sum( real_qty ), 0 ) AS nok_rate
+        from pdm_produce_workorder
+        LEFT JOIN pdm_bi_workprocedure ON pdm_bi_workprocedure.workprocedure_id = pdm_produce_workorder.workprocedure_id
+        where workorder_status in ('6','7')
+
+        <if test="workprocedure_id != null and workprocedure_id != ''">
+            and pdm_produce_workorder.workprocedure_id in ${workprocedure_id}
+        </if>
+        <if test="start_time != null and start_time != ''">
+            and pdm_produce_workorder.create_time >= #{start_time}
+        </if>
+        <if test="product_area != null and product_area != ''">
+            and pdm_produce_workorder.product_area >= #{product_area}
+        </if>
+        <if test="end_time != null and end_time != ''">
+            and #{end_time} >= pdm_produce_workorder.create_time
+        </if>
+        GROUP BY pdm_produce_workorder.workprocedure_id
+        <choose>
+            <when test='analysis == "2"'>
+                ,CONCAT(YEAR(pdm_produce_workorder.create_time),"_",WEEK(pdm_produce_workorder.create_time))
+            </when>
+            <when test='analysis == "3"'>
+                ,DATE_FORMAT(pdm_produce_workorder.create_time,'%Y-%m')
+            </when>
+            <otherwise>
+                ,DATE(pdm_produce_workorder.create_time)
+            </otherwise>
+        </choose>
+    </select>
+
+
+
+    <select id="scrapRate" resultType="java.util.Map">
+        SELECT
+        pdm_produce_workorder.product_area,
+        pdm_produce_workorder.device_code,
+        sum( real_qty ) real_qty,
+        sum( nok_qty ) nok_qty,
+        pdm_bi_device.device_name,
+        pdm_bi_workprocedure.workprocedure_name,
+        IF
+        ( sum( real_qty ) > 0, sum( nok_qty ) / sum( real_qty ), 99 ) AS nok_rate
+        FROM
+        pdm_produce_workorder
+        LEFT JOIN pdm_bi_device ON pdm_bi_device.device_code = pdm_produce_workorder.device_code
+        LEFT JOIN pdm_bi_workprocedure ON pdm_bi_workprocedure.workprocedure_id = pdm_produce_workorder.workprocedure_id
+        WHERE
+        workorder_status IN ( '6', '7' )
+        <if test="device_code != null and device_code != ''">
+            and  pdm_produce_workorder.device_code = #{device_code}
+        </if>
+        <if test="workprocedure_id != null and workprocedure_id != ''">
+            and  pdm_produce_workorder.workprocedure_id = #{workprocedure_id}
+        </if>
+        <if test="start_time != null and start_time != ''">
+            and pdm_produce_workorder.create_time >= #{start_time}
+        </if>
+        <if test="product_area != null and product_area != ''">
+            and  pdm_produce_workorder.product_area >= #{product_area}
+        </if>
+        <if test="end_time != null and end_time != ''">
+            and  #{end_time} >= create_time
+        </if>
+        GROUP BY pdm_produce_workorder.device_code
+
+    </select>
+    <select id="productCap" resultType="java.util.Map">
+        SELECT	GROUP_CONCAT(pdm_produce_workorder.workorder_code) orders,
+        pdm_produce_workorder.product_area,
+        pdm_produce_workorder.device_code,
+        pdm_bi_device.device_name,
+        REPLACE(pdm_bi_bomdtl.manufacture,'ph','') theory,
+        sum(real_qty)/sum( TIMESTAMPDIFF( HOUR, confirm_time, open_time ) ) realty,
+        pdm_bi_workprocedure.workprocedure_name,
+        sum( real_qty ) real_qty,
+        sum( plan_qty ) plan_qty,
+        sum( TIMESTAMPDIFF( HOUR, confirm_time, open_time ) ) hours
+        FROM
+        pdm_produce_workorder
+        LEFT JOIN pdm_bi_device ON pdm_bi_device.device_code = pdm_produce_workorder.device_code
+        LEFT JOIN pdm_bi_workprocedure ON pdm_bi_workprocedure.workprocedure_id = pdm_produce_workorder.workprocedure_id
+        LEFT JOIN pdm_bi_bomdtl on pdm_bi_device.device_name = pdm_bi_bomdtl.resources
+        WHERE
+        workorder_status IN ( '6', '7' )
+        <if test="device_code != null and device_code != ''">
+            and  pdm_produce_workorder.device_code = #{device_code}
+        </if>
+        <if test="workprocedure_id != null and workprocedure_id != ''">
+            and  pdm_produce_workorder.workprocedure_id = #{workprocedure_id}
+        </if>
+        <if test="start_time != null and start_time != ''">
+            and pdm_produce_workorder.create_time >= #{start_time}
+        </if>
+        <if test="product_area != null and product_area != ''">
+            and  pdm_produce_workorder.product_area >= #{product_area}
+        </if>
+        <if test="end_time != null and end_time != ''">
+            and  #{end_time} >= pdm_produce_workorder.create_time
+        </if>
+        GROUP BY
+        device_code
+    </select>
+    <select id="qualityAnalysisByDevice" resultType="java.util.Map">
+        select COUNT(pdm_produce_workorder.workprocedure_id) order_count,
+        pdm_produce_workorder.device_code,
+        pdm_produce_workorder.workprocedure_id,
+        YEAR(pdm_produce_workorder.create_time) '4',
+        DATE_FORMAT(pdm_produce_workorder.create_time,'%Y-%m') '3',
+        CONCAT(YEAR(pdm_produce_workorder.create_time),"_",WEEK(pdm_produce_workorder.create_time)) '2',
+        DATE_FORMAT(pdm_produce_workorder.create_time,'%Y-%m-%d') '1',
+        sum(plan_qty) plan_qty,
+        SUM(real_qty) real_qty,
+        SUM(nok_qty) nok_qty,
+        IF( SUM(real_qty) > 0, sum( nok_qty )*100 / sum( real_qty ), 0 ) AS nok_rate
+        from pdm_produce_workorder
+        LEFT JOIN pdm_bi_workprocedure ON pdm_bi_workprocedure.workprocedure_id = pdm_produce_workorder.workprocedure_id
+        where workorder_status in ('6','7') and pdm_produce_workorder.workprocedure_id = #{workprocedure_id}
+        <if test="device_code != null and device_code != ''">
+            and  pdm_produce_workorder.device_code in ${device_code}
+        </if>
+        <if test="start_time != null and start_time != ''">
+            and pdm_produce_workorder.create_time >= #{start_time}
+        </if>
+        <if test="product_area != null and product_area != ''">
+            and  pdm_produce_workorder.product_area >= #{product_area}
+        </if>
+        <if test="end_time != null and end_time != ''">
+            and  #{end_time} >= pdm_produce_workorder.create_time
+        </if>
+        GROUP BY pdm_produce_workorder.device_code
+        <choose>
+            <when test='analysis == "2"'>
+                ,CONCAT(YEAR(pdm_produce_workorder.create_time),"_",WEEK(pdm_produce_workorder.create_time))
+            </when>
+            <when test='analysis == "3"'>
+                ,DATE_FORMAT(pdm_produce_workorder.create_time,'%Y-%m')
+            </when>
+            <otherwise>
+                ,DATE(pdm_produce_workorder.create_time)
+            </otherwise>
+        </choose>
+    </select>
+
 </mapper>