diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
index 89162c43..b0ab6527 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
@@ -361,12 +361,12 @@ public class AbnormalBillController {
 
     }
 
-    @GetMapping("/findResrceBySfc")
-    public R findResrceBySfc(SfcDispatchDto sfcDispatch){
+    @GetMapping("/findResrceAndWorkCenterBySfc")
+    public R findResrceAndWorkCenterBySfc(SfcDispatchDto sfcDispatch){
         try{
-            return R.ok(sfcDispatchCommonService.findResrceBySfc(sfcDispatch));
+            return R.ok(sfcDispatchCommonService.findResrceAndWorkCenterBySfc(sfcDispatch));
         }catch (Exception e){
-            return R.failed("根据sfc查找设备失败:"+e.getMessage());
+            return R.failed("根据sfc查找设备和工作中心失败:"+e.getMessage());
         }
     }
 
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java
index c01e2eba..007188e7 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java
@@ -10,7 +10,6 @@ import com.foreverwin.mesnac.anomaly.dto.PartsManufacturing;
 import com.foreverwin.mesnac.anomaly.service.ReportService;
 import com.foreverwin.mesnac.integration.model.IntegrationLog;
 import com.foreverwin.modular.core.util.CommonMethods;
-import com.foreverwin.modular.core.util.FrontPage;
 import com.foreverwin.modular.core.util.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -82,4 +81,6 @@ public class ReportController {
             return R.failed(e.getMessage());
         }
     }
+
+
 }
diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java
index 0ca38386..80672bcb 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java
@@ -1,6 +1,5 @@
 package com.foreverwin.mesnac.anomaly.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.foreverwin.mesnac.anomaly.dto.PartsManufacturing;
 import com.foreverwin.mesnac.anomaly.mapper.ReportMapper;
 import com.foreverwin.mesnac.anomaly.service.ReportService;
@@ -61,6 +60,12 @@ public class ReportServiceImpl implements ReportService {
         return reportMapper.partsManufacturing(site,locale,partsManufacturing);
     }
 
+    /**
+     * 余料退回明细表
+     * @param item
+     * @param itemDescription
+     * @return
+     */
     @Override
     public List<Map<String, Object>> surplusReturnTable(String item, String itemDescription) {
         String locale = LocaleContextHolder.getLocale().getLanguage();
@@ -68,13 +73,16 @@ public class ReportServiceImpl implements ReportService {
         return reportMapper.surplusReturnTable(site,locale,item,itemDescription);
     }
 
+    /**
+     * 资源维修报表
+     * @param map
+     * @return
+     */
     @Override
     public List<Map<String, Object>> resourceRepair(Map<String, Object> map) {
         String locale = LocaleContextHolder.getLocale().getLanguage();
         String site = CommonMethods.getSite();
 
-
-
         Map<String, List<NcCode>> ncCodeMap = new HashMap<>();
         NcCode ncCode = new NcCode();
         ncCode.setSite(site);
@@ -132,6 +140,11 @@ public class ReportServiceImpl implements ReportService {
         return maps;
     }
 
+    /**
+     * 检验记录报表
+     * @param paramMap
+     * @return
+     */
     @Override
     public List<Map<String, Object>> findInspectionTask(Map paramMap) {
         return reportMapper.findInspectionTask(paramMap);
diff --git a/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java b/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java
new file mode 100644
index 00000000..08a73edd
--- /dev/null
+++ b/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java
@@ -0,0 +1,41 @@
+package com.foreverwin.mesnac.common.controller;
+
+/**
+ * @Description TODO
+ * @Author zhaojiawei
+ * @Since 2021-08-23
+ */
+
+import com.foreverwin.mesnac.common.service.ReportDataService;
+import com.foreverwin.modular.core.util.CommonMethods;
+import com.foreverwin.modular.core.util.R;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/REPORT-DATA")
+public class ReportDataController {
+
+    @Autowired
+    public ReportDataService reportDataService;
+
+    /**
+     * 查询质量检验任务
+     *
+     * @param paramMap
+     * @return
+     */
+    @GetMapping("/findInspectionTask")
+    public R findInspectionTask(@RequestParam(required = false) Map paramMap) {
+        try {
+            paramMap.put("site", CommonMethods.getSite());
+            List<Map<String, Object>> result = reportDataService.findInspectionTask(paramMap);
+            return R.ok(result);
+        } catch (Exception e) {
+            return R.failed(e.getMessage());
+        }
+    }
+}
diff --git a/common/src/main/java/com/foreverwin/mesnac/common/dto/LabelPrintDto.java b/common/src/main/java/com/foreverwin/mesnac/common/dto/LabelPrintDto.java
index d576e969..2a9749f5 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/dto/LabelPrintDto.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/dto/LabelPrintDto.java
@@ -49,6 +49,8 @@ public class LabelPrintDto implements Serializable {
     private String operation;
     //打印张数
     private Integer printNum;
+    //是否主观件
+    private String mainPart;
 
     public String getItemNumber() {
         return itemNumber;
@@ -201,4 +203,12 @@ public class LabelPrintDto implements Serializable {
     public void setPrintNum(Integer printNum) {
         this.printNum = printNum;
     }
+
+    public String getMainPart() {
+        return mainPart;
+    }
+
+    public void setMainPart(String mainPart) {
+        this.mainPart = mainPart;
+    }
 }
diff --git a/common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java b/common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java
new file mode 100644
index 00000000..a4d13aaa
--- /dev/null
+++ b/common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java
@@ -0,0 +1,11 @@
+package com.foreverwin.mesnac.common.mapper;
+
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public interface ReportDataMapper {
+    List<Map<String, Object>> findInspectionTask(Map paramMap);
+}
diff --git a/common/src/main/java/com/foreverwin/mesnac/common/model/ProdReadyTask.java b/common/src/main/java/com/foreverwin/mesnac/common/model/ProdReadyTask.java
index 35d33a22..f622a1e7 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/model/ProdReadyTask.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/model/ProdReadyTask.java
@@ -191,7 +191,29 @@ public class ProdReadyTask extends Model<ProdReadyTask> {
    @TableField(exist = false)
    private String texture;
 
-   public String getMatSpec() {
+    @TableField(exist = false)
+    private String prodHours;
+
+    @TableField(exist = false)
+    private String qty;
+
+    public String getQty() {
+        return qty;
+    }
+
+    public void setQty(String qty) {
+        this.qty = qty;
+    }
+
+    public String getProdHours() {
+        return prodHours;
+    }
+
+    public void setProdHours(String prodHours) {
+        this.prodHours = prodHours;
+    }
+
+    public String getMatSpec() {
       return matSpec;
    }
 
diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/ReportDataService.java b/common/src/main/java/com/foreverwin/mesnac/common/service/ReportDataService.java
new file mode 100644
index 00000000..84d18732
--- /dev/null
+++ b/common/src/main/java/com/foreverwin/mesnac/common/service/ReportDataService.java
@@ -0,0 +1,14 @@
+package com.foreverwin.mesnac.common.service;
+
+import java.util.List;
+import java.util.Map;
+
+public interface ReportDataService {
+    /**
+     * 查询质量检验任务
+     *
+     * @param paramMap
+     * @return
+     */
+    List<Map<String, Object>> findInspectionTask(Map paramMap);
+}
diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/SfcDispatchCommonService.java b/common/src/main/java/com/foreverwin/mesnac/common/service/SfcDispatchCommonService.java
index 12d95b2c..9b85e83a 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/service/SfcDispatchCommonService.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/service/SfcDispatchCommonService.java
@@ -43,7 +43,7 @@ public interface SfcDispatchCommonService {
      * @param sfcDispatch
      * @return
      */
-    SfcDispatchDto findResrceBySfc(SfcDispatchDto sfcDispatch);
+    SfcDispatchDto findResrceAndWorkCenterBySfc(SfcDispatchDto sfcDispatch);
 
     /**
      * 查询派工单
diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionTaskServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionTaskServiceImpl.java
index 9e041d9e..e933f1e5 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionTaskServiceImpl.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionTaskServiceImpl.java
@@ -180,7 +180,7 @@ public class InspectionTaskServiceImpl extends ServiceImpl<InspectionTaskMapper,
         }else {
             String handle = "InspectionTaskBO:" + site + "," + UUID.randomUUID().toString();
             Date date = new Date(System.currentTimeMillis());
-            SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyyMMddHHmmss");
+            SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyyMMddHHmmssSSS");
             String taskNo = "";
             String itemNumber = (String) paramMap.get("ITEM_NUMBER");
             String description = "";
@@ -275,7 +275,7 @@ public class InspectionTaskServiceImpl extends ServiceImpl<InspectionTaskMapper,
 
         String handle = "InspectionTaskBO:" + site + "," + UUID.randomUUID().toString();
         Date date = new Date(System.currentTimeMillis());
-        SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyyMMddHHmmss");
+        SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyyMMddHHmmssSSS");
         String taskNo = "";
         if (StringUtil.isBlank(itemNumber)) {
             taskNo = "P_" + dateFormat1.format(date);
diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ReportDataServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ReportDataServiceImpl.java
new file mode 100644
index 00000000..ffa1d225
--- /dev/null
+++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ReportDataServiceImpl.java
@@ -0,0 +1,23 @@
+package com.foreverwin.mesnac.common.service.impl;
+
+import com.foreverwin.mesnac.common.mapper.ReportDataMapper;
+import com.foreverwin.mesnac.common.service.ReportDataService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class ReportDataServiceImpl implements ReportDataService{
+
+    @Autowired
+    private ReportDataMapper reportDataMapper;
+
+    @Override
+    public List<Map<String, Object>> findInspectionTask(Map paramMap) {
+        return reportDataMapper.findInspectionTask(paramMap);
+    }
+}
diff --git a/common/src/main/resources/mapper/ProdReadyTaskMapper.xml b/common/src/main/resources/mapper/ProdReadyTaskMapper.xml
index b2dea01b..0cd501cd 100644
--- a/common/src/main/resources/mapper/ProdReadyTaskMapper.xml
+++ b/common/src/main/resources/mapper/ProdReadyTaskMapper.xml
@@ -631,7 +631,7 @@
     </delete>
     <!-- BaseMapper标准查询/修改/删除 -->
     <select id="getTaskList" resultMap="BaseResultMap">
-        SELECT c3.value TEXTURE,c4.value MAT_SPEC,zsd.BLANKING_SIZE,PREZSD.EMPLOYEE_DESCRIPTION,CASE WHEN TO_NUMBER(zsd.DISPATCH_SEQ)=1 THEN NULL
+        SELECT zsd.PROD_HOURS,S.QTY,c3.value TEXTURE,c4.value MAT_SPEC,zsd.BLANKING_SIZE,PREZSD.EMPLOYEE_DESCRIPTION,CASE WHEN TO_NUMBER(zsd.DISPATCH_SEQ)=1 THEN NULL
         WHEN SS.STEP_SEQUENCE>TO_NUMBER(zsd.DISPATCH_SEQ)-1 THEN '完成'
         ELSE '未完成' END LAST_OPERATION_STATUS
         ,PREOT.DESCRIPTION LAST_OPERATION,zprt.*,zsd.DISPATCH_NO,zsd.RESOURCE_TYPE,RES.DESCRIPTION RESRCE_DESC,ITT.DESCRIPTION ITEM_DESC,OT.DESCRIPTION OPERATION_DESC
diff --git a/common/src/main/resources/mapper/ReportDataMapper.xml b/common/src/main/resources/mapper/ReportDataMapper.xml
new file mode 100644
index 00000000..973b39b0
--- /dev/null
+++ b/common/src/main/resources/mapper/ReportDataMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.foreverwin.mesnac.common.mapper.ReportDataMapper">
+
+    <select id="findInspectionTask" resultType="java.util.HashMap" parameterType="java.util.HashMap">
+        SELECT 	WT.DESCRIPTION  WORK_CENTER_DESCRIPTION, C2.VALUE ITEM_NUMBER, C3.VALUE PRODUCT_MODEL,IM.ITEM ITEM, IT.DESCRIPTION ITEM_DESCRIPTION,
+        ZT.SFC, ZT.OPERATION, OT.DESCRIPTION OPERATION_DESCRIPTION, ZT.RESRCE, RS.DESCRIPTION RESOURCE_DESCRIPTION, ZT.TASK_NO, ZT.CATEGORY,
+        ZT."RESULT", ZT.CREATE_USER, ZNU.FULL_NAME, ZT.MODIFIED_DATE_TIME
+        FROM Z_INSPECTION_TASK ZT
+        LEFT JOIN WORK_CENTER WC ON WC.SITE = ZT.SITE AND WC.WORK_CENTER = ZT.WORK_CENTER
+        LEFT JOIN WORK_CENTER_T WT ON WT.WORK_CENTER_BO = WC.HANDLE AND WT.LOCALE = 'zh'
+        INNER JOIN SHOP_ORDER SO ON ZT.SITE = SO.SITE AND ZT.SHOP_ORDER = SO.SHOP_ORDER
+        LEFT JOIN CUSTOM_FIELDS C1 ON C1.HANDLE = SO.HANDLE AND C1."ATTRIBUTE" = 'WORK_ORDER'
+        LEFT JOIN CUSTOM_FIELDS C2 ON C2.HANDLE = SO.HANDLE AND C2."ATTRIBUTE" = 'ITEM_NUMBER'
+        LEFT JOIN CUSTOM_FIELDS C3 ON C3.HANDLE = SO.HANDLE AND C3."ATTRIBUTE" = 'PRODUCT_MODEL'
+        INNER JOIN ITEM IM ON IM.HANDLE = SO.ITEM_BO
+        LEFT JOIN ITEM_T IT ON IT.ITEM_BO = IM.HANDLE AND IT.LOCALE = 'zh'
+        INNER JOIN OPERATION OP ON OP.SITE = ZT.SITE AND OP.OPERATION = ZT.OPERATION AND OP.CURRENT_REVISION = 'true'
+        LEFT JOIN OPERATION_T OT ON OT.OPERATION_BO = OP.HANDLE AND OT.LOCALE = 'zh'
+        INNER JOIN RESRCE RS ON RS.SITE = ZT.SITE AND RS.RESRCE = ZT.RESRCE
+        LEFT JOIN Z_NWA_USER ZNU ON ZNU.SITE = ZT.SITE AND ZNU.USER_NAME = ZT.CREATE_USER
+        WHERE ZT.SITE = #{site}
+        <if test="workCenter != null and workCenter != ''" >
+            AND WC.WORK_CENTER = #{workCenter}
+        </if>
+        <if test="category != null and category != ''" >
+            AND ZT.CATEGORY = #{category}
+        </if>
+        <if test="itemNumber != null and itemNumber != ''" >
+            AND C2.VALUE LIKE '%'||#{itemNumber}||'%'
+        </if>
+        <if test="model != null and model != ''" >
+            AND C3.VALUE LIKE '%'||#{model}||'%'
+        </if>
+        <if test="operation != null and operation != ''" >
+            AND ZT.OPERATION = #{operation}
+        </if>
+        <if test="resrce != null and resrce != ''" >
+            AND ZT.RESRCE = #{resrce}
+        </if>
+        <if test="result != null and result != ''" >
+            AND ZT.RESULT = #{result}
+        </if>
+        <if test="startFromDate != null and startFromDate != ''" >
+            AND ZT.MODIFIED_DATE_TIME >= TO_DATE(#{startFromDate}, 'YYYY-MM-DD')
+        </if>
+        <if test="startToDate != null and startToDate != ''" >
+            AND ZT.MODIFIED_DATE_TIME &lt;= TO_DATE(#{startToDate}|| '23:59:59', 'YYYY-MM-DD HH24:MI:SS')
+        </if>
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java
index fd7366f3..4ca9ed10 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java
@@ -53,7 +53,7 @@ public interface SfcDispatchMapper extends BaseMapper<SfcDispatch> {
      * @param site
      * @return
      */
-    SfcDispatchDto findResrceBySfc(@Param("sfcDispatch")SfcDispatchDto sfcDispatch, @Param("site") String site);
+    SfcDispatchDto findResrceAndWorkCenterBySfc(@Param("sfcDispatch")SfcDispatchDto sfcDispatch, @Param("site") String site);
 
     SfcDispatchDto findSfcDispatchBySfc(@Param("site")String site, @Param("dto")SfcDispatchDto sfcDispatch);
 
diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java
index 493b80f6..1192b2e5 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java
@@ -691,10 +691,9 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
     }
 
     @Override
-    public SfcDispatchDto findResrceBySfc(SfcDispatchDto sfcDispatch) {
+    public SfcDispatchDto findResrceAndWorkCenterBySfc(SfcDispatchDto sfcDispatch) {
         String site = CommonMethods.getSite();
-        String[] status = {"START","COMPLETE"};
-        return sfcDispatchMapper.findResrceBySfc(sfcDispatch,site);
+        return sfcDispatchMapper.findResrceAndWorkCenterBySfc(sfcDispatch,site);
     }
 
     @Override
diff --git a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
index 2e742f66..d8bb39bc 100644
--- a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
+++ b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
@@ -794,15 +794,15 @@
         WHERE SITE = #{site} AND DISPATCH_NO = #{dispatchNo}
     </update>
 
-    <select id="findResrceBySfc" resultType="com.foreverwin.mesnac.common.dto.SfcDispatchDto">
-        SELECT ZSD2.RESRCE FROM
+    <select id="findResrceAndWorkCenterBySfc" resultType="com.foreverwin.mesnac.common.dto.SfcDispatchDto">
+        SELECT ZSD2.RESRCE,ZSD2.WORK_CENTER WORK_CENTER FROM
         SFC S
         INNER JOIN SFC_ROUTING SR ON SR.SFC_BO  = S.HANDLE
         INNER JOIN SFC_ROUTER ST ON ST.SFC_ROUTING_BO  = SR.HANDLE
         INNER JOIN SFC_STEP SS ON SS.SFC_ROUTER_BO = ST.HANDLE  AND (SS.QTY_IN_QUEUE > 0 OR SS.QTY_IN_WORK > 0)
         LEFT JOIN Z_SFC_DISPATCH ZSD2 ON ZSD2.DISPATCH_NO = S.SFC || '-' || SS.STEP_ID
         WHERE S.SITE = #{site}
-        AND ZSD2.RESRCE IS NOT NULL AND S.SFC = #{sfcDispatch.sfc}
+        AND S.SFC = #{sfcDispatch.sfc}
     </select>
 
     <select id="findSfcDispatchBySfc" resultType="com.foreverwin.mesnac.common.dto.SfcDispatchDto">
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java
index 69dd3142..6141912d 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java
@@ -10,6 +10,7 @@ import com.foreverwin.mesnac.common.service.InspectionItemService;
 import com.foreverwin.mesnac.equip.mapper.ResourceInspectTaskMapper;
 import com.foreverwin.mesnac.equip.model.*;
 import com.foreverwin.mesnac.equip.service.*;
+import com.foreverwin.mesnac.meapi.mapper.ResrceMapper;
 import com.foreverwin.mesnac.meapi.model.UserGroup;
 import com.foreverwin.mesnac.meapi.service.UserGroupService;
 import com.foreverwin.modular.core.exception.BusinessException;
@@ -59,6 +60,8 @@ public class ResourceInspectPlanServiceImpl extends ServiceImpl<ResourceInspectP
     public ResourceInspectTaskParamService resourceInspectTaskParamService;
     @Autowired
     public ResourceInspectTaskMapper resourceInspectTaskMapper;
+    @Autowired
+    public ResrceMapper resrceMapper;
 
     @Override
     public IPage<ResourceInspectPlan> selectPage(FrontPage<ResourceInspectPlan> frontPage, ResourceInspectPlan resourceInspectPlan) {
@@ -274,6 +277,11 @@ public class ResourceInspectPlanServiceImpl extends ServiceImpl<ResourceInspectP
                 continue;
             }
             String resourceNo = equip.getResourceNo();
+            // 设备是否点检
+            String inspectByResrce = resrceMapper.isInspectByResrce(site, resourceNo);
+            if (inspectByResrce != null && inspectByResrce.equals("N")){
+                continue;
+            }
             /**
              * 按计划handle和设备编号，查询检验任务
              * bug：每次都会获取设备的所有检验任务，不做改动的情况下：数据会累加造成数据遍历量较大
@@ -401,7 +409,11 @@ public class ResourceInspectPlanServiceImpl extends ServiceImpl<ResourceInspectP
         if (newInspectTask.getTaskCreateDate().isAfter(indateEnd)){
             return;
         }
-
+        // 设备s是否点检
+        String inspectByResrce = resrceMapper.isInspectByResrce(site, resrce);
+        if (inspectByResrce != null && inspectByResrce.equals("N")){
+            return;
+        }
         ResourceInspectTask inspectTask = setResourceInspectTask(inspectPlan, newInspectTask, -1);
         List<String> nextNumber = nextNumberHelper.getNextNumber(site, Constants.RESOURCE_INSPECT_TASK, 1);
         inspectTask.setTaskNo(nextNumber.get(0));
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/UserGroupController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/UserGroupController.java
index 43921e13..e754ce38 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/UserGroupController.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/UserGroupController.java
@@ -124,8 +124,8 @@ public class UserGroupController {
 
 
     @ResponseBody
-    @PostMapping("/findAbnormalUserGroup")
-    public R findAbnormalUserGroup(@RequestBody Map<String,Object> param){
+    @GetMapping("/findAbnormalUserGroup")
+    public R findAbnormalUserGroup(@RequestParam(required = false) Map<String,Object> param){
         try{
             return R.ok(userGroupService.findAbnormalUserGroup(param));
         }catch (Exception e){
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ResrceMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ResrceMapper.java
index 2f160c35..bd7cbf1f 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ResrceMapper.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ResrceMapper.java
@@ -41,4 +41,7 @@ public interface ResrceMapper extends BaseMapper<Resrce> {
     ResrceWorkCenter findResourceAndWorkCenterByResource(Resrce resrce);
 
     List<Resrce> selectResourceListByUT(@Param("site") String site, @Param("resourceType") String resourceType, @Param("userList") String[] userList);
+
+    String isInspectByResrce(@Param("site") String site, @Param("resrce") String resrce);
+
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java
index 2003170d..e1fc320d 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java
@@ -34,6 +34,6 @@ public interface UserGroupMapper extends BaseMapper<UserGroup> {
 
      List<UserGroup> findUserGroupListByUser(@Param("site")String site,@Param("user")String user);
 
-     List<UserGroup> findAbnormalUserGroup(@Param("site")String site, @Param("param")Map<String,Object> map);
+     List<UserGroup> findAbnormalUserGroup(@Param("site")String site, @Param("param")Map<String,Object> param);
 
 }
\ No newline at end of file
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ShopOrderServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ShopOrderServiceImpl.java
index b888036b..fb81c8b9 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ShopOrderServiceImpl.java
+++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ShopOrderServiceImpl.java
@@ -1,18 +1,18 @@
 package com.foreverwin.mesnac.meapi.service.impl;
 
-import com.foreverwin.mesnac.meapi.dto.ShopOrderDto;
-import com.foreverwin.modular.core.util.CommonMethods;
-import com.foreverwin.modular.core.util.FrontPage;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.foreverwin.mesnac.meapi.model.ShopOrder;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.foreverwin.mesnac.meapi.dto.ShopOrderDto;
 import com.foreverwin.mesnac.meapi.mapper.ShopOrderMapper;
+import com.foreverwin.mesnac.meapi.model.ShopOrder;
 import com.foreverwin.mesnac.meapi.service.ShopOrderService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.foreverwin.modular.core.util.CommonMethods;
+import com.foreverwin.modular.core.util.FrontPage;
 import com.sap.me.status.StatusBOHandle;
 import org.eclipse.jetty.util.StringUtil;
-import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
diff --git a/meapi/src/main/resources/mapper/ResrceMapper.xml b/meapi/src/main/resources/mapper/ResrceMapper.xml
index ccfef860..a95a614c 100644
--- a/meapi/src/main/resources/mapper/ResrceMapper.xml
+++ b/meapi/src/main/resources/mapper/ResrceMapper.xml
@@ -615,7 +615,7 @@
     <!--设备是否点检-->
     <select id="isInspectByResrce" resultType="java.lang.String">
         SELECT CF.VALUE FROM RESRCE R
-        LEFT JOIN CUSTOM_FIELDS cf ON CF.HANDLE = R.HANDLE AND CF."ATTRIBUTE" = 'IS_SPOT'
+        LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = R.HANDLE AND CF."ATTRIBUTE" = 'IS_SPOT'
         WHERE R.RESRCE = #{resrce} AND R.SITE = #{site}
     </select>
 
diff --git a/meapi/src/main/resources/mapper/UserGroupMapper.xml b/meapi/src/main/resources/mapper/UserGroupMapper.xml
index 4bd1b9e0..ec64be23 100644
--- a/meapi/src/main/resources/mapper/UserGroupMapper.xml
+++ b/meapi/src/main/resources/mapper/UserGroupMapper.xml
@@ -391,12 +391,13 @@
     </select>
 
     <select id="findAbnormalUserGroup" resultMap="BaseResultMap">
-        SELECT <include refid="Base_Column_List"></include>
+        SELECT ug.USER_GROUP USER_GROUP,ug.DESCRIPTION DESCRIPTION
         FROM USER_GROUP ug
-        INNER JOIN CUSTOM_FIELDS cf ON cf.HANDLE = ug.HANDLE AND cf."ATTRIBUTE" = 'TYPE'
+        INNER JOIN CUSTOM_FIELDS cf ON cf.HANDLE = ug.HANDLE AND cf."ATTRIBUTE" = 'USER_GROUP_TYPE'
         <where>
+            ug.SITE = #{site}
             <if test="param.type != null and param.type != ''">
-                cf.VALUE LIKE '%${param.type}%'
+                AND cf.VALUE = #{param.type}
             </if>
         </where>
     </select>