diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/EquipmentAssetDetailsController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/EquipmentAssetDetailsController.java
index f6ae571e..cdb6bc31 100644
--- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/EquipmentAssetDetailsController.java
+++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/EquipmentAssetDetailsController.java
@@ -1,5 +1,6 @@
 package com.foreverwin.mesnac.anomaly.controller;
 
+import com.foreverwin.mesnac.anomaly.mapper.EquipmentAssetDetailsMapper;
 import com.foreverwin.mesnac.common.util.StringUtil;
 import com.foreverwin.modular.core.util.R;
 import com.foreverwin.modular.core.util.FrontPage;
@@ -28,6 +29,9 @@ public class EquipmentAssetDetailsController {
     @Autowired
     public EquipmentAssetDetailsService equipmentAssetDetailsService;
 
+    @Autowired
+    public EquipmentAssetDetailsMapper equipmentAssetDetailsMapper;
+
     /**
     * 根据id查询
     *
@@ -98,6 +102,13 @@ public class EquipmentAssetDetailsController {
         String handle = StringUtil.createQUID();
         String user = CommonMethods.getUser();
         String site = CommonMethods.getSite();
+        EquipmentAssetDetails details = new EquipmentAssetDetails();
+        details.setAssetNumbers(equipmentAssetDetails.getAssetNumbers());
+        List<EquipmentAssetDetails> selectList = equipmentAssetDetailsService.selectList(details);
+        if (selectList.size() != 0){
+            return R.failed("资产编号:"+ equipmentAssetDetails.getAssetNumbers() + "不允许重复");
+        }
+
         LocalDateTime now = LocalDateTime.now();
         equipmentAssetDetails.setHandle(handle);
         equipmentAssetDetails.setSite(site);
@@ -117,6 +128,12 @@ public class EquipmentAssetDetailsController {
     public R updateById(@RequestBody EquipmentAssetDetails equipmentAssetDetails) {
         String user = CommonMethods.getUser();
         LocalDateTime now = LocalDateTime.now();
+        EquipmentAssetDetails details = new EquipmentAssetDetails();
+        details.setAssetNumbers(equipmentAssetDetails.getAssetNumbers());
+        List<EquipmentAssetDetails> selectList = equipmentAssetDetailsService.selectList(details);
+        if (selectList.size() != 0 && !selectList.get(0).getHandle().equals(equipmentAssetDetails.getHandle())){
+            return R.failed("资产编号:"+ equipmentAssetDetails.getAssetNumbers() + "不允许重复");
+        }
         equipmentAssetDetails.setUpdatedBy(user);
         equipmentAssetDetails.setUpdatedTime(now);
         return R.ok(equipmentAssetDetailsService.updateById(equipmentAssetDetails));
diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml
index 34675ae6..9cf8ca11 100644
--- a/anomaly/src/main/resources/mapper/ReportMapper.xml
+++ b/anomaly/src/main/resources/mapper/ReportMapper.xml
@@ -2204,50 +2204,23 @@
     </select>
     <select id="projectProcessingCycleReport" resultType="java.util.Map" parameterType="java.util.HashMap">
         --项目加工周期报表
-        SELECT wct.DESCRIPTION                                                                                   WORK_CENTER_DESCRIPTION,
-        o.OPERATION                                                                                       "operation",
-        ot.DESCRIPTION                                                                                    OPERATION_DESCRIPTION,
-        RT.DESCRIPTION                                                                                    RESOURCE_TYPE_DESCRIPTION,
-        SUM(CASE
-        WHEN zsd.DISPATCH_STATUS != 'COMPLETE' OR zsd.DISPATCH_STATUS != 'CANCEL' THEN
-        zsd.PROD_HOURS * zsd.DISPATCH_QTY
-        ELSE 0 END)                                                                               UN_OPERATION_HOURS,
-        cf2.VALUE                                                                                         WORK_ORDER,
-        SUM(zsd.PROD_HOURS * zsd.DISPATCH_QTY)                                                            WORK_ORDER_HOURS,
-        CF.VALUE                                                                                          "dayCapacity",
-        TO_CHAR(SUM(DECODE(CF.VALUE, NULL, 0, zsd.PROD_HOURS * zsd.DISPATCH_QTY / CF.VALUE)), '99990.99') PRODUCTION_DAY,
-        TO_CHAR(SUM(DECODE(CF.VALUE, NULL, 0, CASE
-        WHEN zsd.DISPATCH_STATUS != 'COMPLETE' OR zsd.DISPATCH_STATUS != 'CANCEL'
-        THEN
-        zsd.PROD_HOURS * zsd.DISPATCH_QTY
-        ELSE 0 END / CF.VALUE)), '99990.99')                    UN_HOURS_DAY
-        FROM Z_SFC_DISPATCH zsd
-        INNER JOIN WORK_CENTER wc ON wc.WORK_CENTER = zsd.WORK_CENTER AND wc.SITE = zsd.SITE
-        LEFT JOIN WORK_CENTER_T wct ON wct.WORK_CENTER_BO = wc.HANDLE AND wct.LOCALE = 'zh'
-        LEFT JOIN SFC s ON s.SFC = zsd.SFC AND s.SITE = zsd.SITE
-        LEFT JOIN RESRCE rs ON zsd.SITE = rs.SITE AND zsd.RESRCE = rs.RESRCE
-        LEFT JOIN RESOURCE_TYPE RT ON zsd.RESOURCE_TYPE = rt.RESOURCE_TYPE
-        LEFT JOIN SHOP_ORDER so ON so.SHOP_ORDER = zsd.SHOP_ORDER AND so.SITE = zsd.SITE
-        LEFT JOIN CUSTOM_FIELDS cf2 ON cf2.HANDLE = so.HANDLE AND cf2."ATTRIBUTE" = 'WORK_ORDER'
-        LEFT JOIN OPERATION o ON o.OPERATION = zsd.OPERATION AND o.SITE = zsd.SITE
-        LEFT JOIN OPERATION_T ot ON ot.OPERATION_BO = o.HANDLE AND ot.LOCALE = 'zh'
-        LEFT JOIN CUSTOM_FIELDS CF ON CF.ATTRIBUTE = 'DAY_CAPACITY' AND CF.HANDLE = o.HANDLE
-                --WHERE cf2.VALUE = '2021102000001-工作令/半钢/部套'
-            WHERE  1=1
+        SELECT * FROM project_Processing_Cycle_Report_View V
+        WHERE 1=1
         <if test="workOrder != null and workOrder != ''">
-            AND cf2.VALUE = #{workOrder}
+            AND V.WORK_ORDER = #{workOrder}
         </if>
         <if test="resrce != null and resrce != ''">
-            AND   rs.RESRCE = #{resrce}
+            AND   V.RESOURCE_TYPE_DESCRIPTION = #{resrce}
         </if>
         <if test="operationCode != null and operationCode != ''">
-            AND   o.OPERATION = #{operationCode}
+            AND   V."operation" = #{operationCode}
         </if>
         <if test="operationDescription != null and operationDescription != ''">
-            AND ot.DESCRIPTION = #{operationDescription}
+            AND V.OPERATION_DESCRIPTION = #{operationDescription}
+        </if>
+        <if test="workCenter != null and workCenter != ''">
+            AND V.WORK_CENTER_DESCRIPTION = #{workCenter}
         </if>
-        GROUP BY wct.DESCRIPTION, ot.DESCRIPTION, RT.DESCRIPTION, o.OPERATION, cf2.VALUE, CF.VALUE
-        ORDER BY wct.DESCRIPTION, ot.DESCRIPTION, RT.DESCRIPTION
     </select>
     <select id="lastOperationCompletedReport" resultType="java.util.Map" parameterType="java.util.HashMap">
         SELECT WIP.*,