diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
index 9dc9fca..8377cdb 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
@@ -6,11 +6,11 @@
  * @Date: 2023/8/10 19:40
  */
 public enum QualityTableEnum {
+    //质量监督
     SUPERVISION_RECORD("biz_quality_supervision_record", "监督记录", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_01, 15),
-    NON_CONFORMANCE_REP("biz_quality_non_conformance_rep", "不符合情况分析报告", "file_code", QualityFileNoEnum.TYPE_208, QualityFileTypeEnum.TYPE_01, 15),
-    /**
-     * 纠正措施处理单
-     */
+    SUPERVISION_RECORD_REP("biz_quality_supervision_record", "监督记录报告", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_02, 15),
+    NON_CONFORMANCE_REP("biz_quality_non_conformance_rep", "不符合情况分析报告", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_03, 15),
+    //纠正 预防
     CORRECTIVE_RECORD("biz_quality_corrective_record", "纠正措施处理单", "file_code", QualityFileNoEnum.TYPE_207, QualityFileTypeEnum.TYPE_01, 13),
     PREVENT_RECORD("biz_quality_prevent_record", "预防措施表", "file_code", QualityFileNoEnum.TYPE_208, QualityFileTypeEnum.TYPE_01, 13),
     //内审

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
index 9dc9fca..8377cdb 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
@@ -6,11 +6,11 @@
  * @Date: 2023/8/10 19:40
  */
 public enum QualityTableEnum {
+    //质量监督
     SUPERVISION_RECORD("biz_quality_supervision_record", "监督记录", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_01, 15),
-    NON_CONFORMANCE_REP("biz_quality_non_conformance_rep", "不符合情况分析报告", "file_code", QualityFileNoEnum.TYPE_208, QualityFileTypeEnum.TYPE_01, 15),
-    /**
-     * 纠正措施处理单
-     */
+    SUPERVISION_RECORD_REP("biz_quality_supervision_record", "监督记录报告", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_02, 15),
+    NON_CONFORMANCE_REP("biz_quality_non_conformance_rep", "不符合情况分析报告", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_03, 15),
+    //纠正 预防
     CORRECTIVE_RECORD("biz_quality_corrective_record", "纠正措施处理单", "file_code", QualityFileNoEnum.TYPE_207, QualityFileTypeEnum.TYPE_01, 13),
     PREVENT_RECORD("biz_quality_prevent_record", "预防措施表", "file_code", QualityFileNoEnum.TYPE_208, QualityFileTypeEnum.TYPE_01, 13),
     //内审
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java
index c2120ce..9836fce 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java
@@ -20,7 +20,7 @@
  * @author lwh
  * @date 2023-10-21
  */
-public interface BizQualityNonConformanceRepMapper extends GeneralApprovalMapper<BizQualityNonConformanceRep, BizQualityNonConformanceRep, BizQualityNonConformanceRepVO>{
+public interface BizQualityNonConformanceRepMapper extends GeneralApprovalMapper<BizQualityNonConformanceRep, BizQualityNonConformanceRep, BizQualityNonConformanceRepVO>,IBaseSelectMaxMapper{
     /**
      * 质量活动不符合情况分析报告 分页检索
      */
@@ -42,5 +42,5 @@
      * @param query 检索条件
      * @return
      */
-    Long selectMaxNo(@Param("ew") QueryWrapper<BizQualitySupervisionRecord> query);
+//    Long selectMaxNo(@Param("ew") QueryWrapper<BizQualitySupervisionRecord> query);
 }

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
index 9dc9fca..8377cdb 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
@@ -6,11 +6,11 @@
  * @Date: 2023/8/10 19:40
  */
 public enum QualityTableEnum {
+    //质量监督
     SUPERVISION_RECORD("biz_quality_supervision_record", "监督记录", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_01, 15),
-    NON_CONFORMANCE_REP("biz_quality_non_conformance_rep", "不符合情况分析报告", "file_code", QualityFileNoEnum.TYPE_208, QualityFileTypeEnum.TYPE_01, 15),
-    /**
-     * 纠正措施处理单
-     */
+    SUPERVISION_RECORD_REP("biz_quality_supervision_record", "监督记录报告", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_02, 15),
+    NON_CONFORMANCE_REP("biz_quality_non_conformance_rep", "不符合情况分析报告", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_03, 15),
+    //纠正 预防
     CORRECTIVE_RECORD("biz_quality_corrective_record", "纠正措施处理单", "file_code", QualityFileNoEnum.TYPE_207, QualityFileTypeEnum.TYPE_01, 13),
     PREVENT_RECORD("biz_quality_prevent_record", "预防措施表", "file_code", QualityFileNoEnum.TYPE_208, QualityFileTypeEnum.TYPE_01, 13),
     //内审
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java
index c2120ce..9836fce 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java
@@ -20,7 +20,7 @@
  * @author lwh
  * @date 2023-10-21
  */
-public interface BizQualityNonConformanceRepMapper extends GeneralApprovalMapper<BizQualityNonConformanceRep, BizQualityNonConformanceRep, BizQualityNonConformanceRepVO>{
+public interface BizQualityNonConformanceRepMapper extends GeneralApprovalMapper<BizQualityNonConformanceRep, BizQualityNonConformanceRep, BizQualityNonConformanceRepVO>,IBaseSelectMaxMapper{
     /**
      * 质量活动不符合情况分析报告 分页检索
      */
@@ -42,5 +42,5 @@
      * @param query 检索条件
      * @return
      */
-    Long selectMaxNo(@Param("ew") QueryWrapper<BizQualitySupervisionRecord> query);
+//    Long selectMaxNo(@Param("ew") QueryWrapper<BizQualitySupervisionRecord> query);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java
index a6cf561..bdf7c4e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java
@@ -20,7 +20,7 @@
  * @author lwh
  * @date 2023-10-21
  */
-public interface BizQualitySupervisionRepMapper extends GeneralApprovalMapper<BizQualitySupervisionRep, BizQualitySupervisionRep, BizQualitySupervisionRepVO> {
+public interface BizQualitySupervisionRepMapper extends GeneralApprovalMapper<BizQualitySupervisionRep, BizQualitySupervisionRep, BizQualitySupervisionRepVO>,IBaseSelectMaxMapper {
     /**
      * 质量监督报告 分页检索
      */
@@ -34,5 +34,5 @@
      * @param query 检索条件
      * @return
      */
-    Long selectMaxNo(@Param("ew") QueryWrapper<BizQualitySupervisionRecord> query);
+//    Long selectMaxNo(@Param("ew") QueryWrapper<BizQualitySupervisionRecord> query);
 }

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
index 9dc9fca..8377cdb 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
@@ -6,11 +6,11 @@
  * @Date: 2023/8/10 19:40
  */
 public enum QualityTableEnum {
+    //质量监督
     SUPERVISION_RECORD("biz_quality_supervision_record", "监督记录", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_01, 15),
-    NON_CONFORMANCE_REP("biz_quality_non_conformance_rep", "不符合情况分析报告", "file_code", QualityFileNoEnum.TYPE_208, QualityFileTypeEnum.TYPE_01, 15),
-    /**
-     * 纠正措施处理单
-     */
+    SUPERVISION_RECORD_REP("biz_quality_supervision_record", "监督记录报告", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_02, 15),
+    NON_CONFORMANCE_REP("biz_quality_non_conformance_rep", "不符合情况分析报告", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_03, 15),
+    //纠正 预防
     CORRECTIVE_RECORD("biz_quality_corrective_record", "纠正措施处理单", "file_code", QualityFileNoEnum.TYPE_207, QualityFileTypeEnum.TYPE_01, 13),
     PREVENT_RECORD("biz_quality_prevent_record", "预防措施表", "file_code", QualityFileNoEnum.TYPE_208, QualityFileTypeEnum.TYPE_01, 13),
     //内审
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java
index c2120ce..9836fce 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java
@@ -20,7 +20,7 @@
  * @author lwh
  * @date 2023-10-21
  */
-public interface BizQualityNonConformanceRepMapper extends GeneralApprovalMapper<BizQualityNonConformanceRep, BizQualityNonConformanceRep, BizQualityNonConformanceRepVO>{
+public interface BizQualityNonConformanceRepMapper extends GeneralApprovalMapper<BizQualityNonConformanceRep, BizQualityNonConformanceRep, BizQualityNonConformanceRepVO>,IBaseSelectMaxMapper{
     /**
      * 质量活动不符合情况分析报告 分页检索
      */
@@ -42,5 +42,5 @@
      * @param query 检索条件
      * @return
      */
-    Long selectMaxNo(@Param("ew") QueryWrapper<BizQualitySupervisionRecord> query);
+//    Long selectMaxNo(@Param("ew") QueryWrapper<BizQualitySupervisionRecord> query);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java
index a6cf561..bdf7c4e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java
@@ -20,7 +20,7 @@
  * @author lwh
  * @date 2023-10-21
  */
-public interface BizQualitySupervisionRepMapper extends GeneralApprovalMapper<BizQualitySupervisionRep, BizQualitySupervisionRep, BizQualitySupervisionRepVO> {
+public interface BizQualitySupervisionRepMapper extends GeneralApprovalMapper<BizQualitySupervisionRep, BizQualitySupervisionRep, BizQualitySupervisionRepVO>,IBaseSelectMaxMapper {
     /**
      * 质量监督报告 分页检索
      */
@@ -34,5 +34,5 @@
      * @param query 检索条件
      * @return
      */
-    Long selectMaxNo(@Param("ew") QueryWrapper<BizQualitySupervisionRecord> query);
+//    Long selectMaxNo(@Param("ew") QueryWrapper<BizQualitySupervisionRecord> query);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml
index 948c0f1..a59999d 100644
--- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml
@@ -61,14 +61,14 @@
         </where>
         order by a.create_time desc
     </select>
-    <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(file_code, 3)), 0) from biz_quality_non_conformance_rep
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
+<!--    <select id="selectMaxNo" resultType="java.lang.Long">-->
+<!--        SELECT IFNULL(max(RIGHT(file_code, 3)), 0) from biz_quality_non_conformance_rep-->
+<!--        <where>-->
+<!--            <if test="ew != null">-->
+<!--                ${ew.sqlSegment}-->
+<!--            </if>-->
+<!--        </where>-->
+<!--    </select>-->
     <select id="selectBatchForApprovalList" resultType="com.casic.missiles.model.quality.BizQualityNonConformanceRep">
         select
         a.id ,

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
index 9dc9fca..8377cdb 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
@@ -6,11 +6,11 @@
  * @Date: 2023/8/10 19:40
  */
 public enum QualityTableEnum {
+    //质量监督
     SUPERVISION_RECORD("biz_quality_supervision_record", "监督记录", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_01, 15),
-    NON_CONFORMANCE_REP("biz_quality_non_conformance_rep", "不符合情况分析报告", "file_code", QualityFileNoEnum.TYPE_208, QualityFileTypeEnum.TYPE_01, 15),
-    /**
-     * 纠正措施处理单
-     */
+    SUPERVISION_RECORD_REP("biz_quality_supervision_record", "监督记录报告", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_02, 15),
+    NON_CONFORMANCE_REP("biz_quality_non_conformance_rep", "不符合情况分析报告", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_03, 15),
+    //纠正 预防
     CORRECTIVE_RECORD("biz_quality_corrective_record", "纠正措施处理单", "file_code", QualityFileNoEnum.TYPE_207, QualityFileTypeEnum.TYPE_01, 13),
     PREVENT_RECORD("biz_quality_prevent_record", "预防措施表", "file_code", QualityFileNoEnum.TYPE_208, QualityFileTypeEnum.TYPE_01, 13),
     //内审
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java
index c2120ce..9836fce 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java
@@ -20,7 +20,7 @@
  * @author lwh
  * @date 2023-10-21
  */
-public interface BizQualityNonConformanceRepMapper extends GeneralApprovalMapper<BizQualityNonConformanceRep, BizQualityNonConformanceRep, BizQualityNonConformanceRepVO>{
+public interface BizQualityNonConformanceRepMapper extends GeneralApprovalMapper<BizQualityNonConformanceRep, BizQualityNonConformanceRep, BizQualityNonConformanceRepVO>,IBaseSelectMaxMapper{
     /**
      * 质量活动不符合情况分析报告 分页检索
      */
@@ -42,5 +42,5 @@
      * @param query 检索条件
      * @return
      */
-    Long selectMaxNo(@Param("ew") QueryWrapper<BizQualitySupervisionRecord> query);
+//    Long selectMaxNo(@Param("ew") QueryWrapper<BizQualitySupervisionRecord> query);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java
index a6cf561..bdf7c4e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java
@@ -20,7 +20,7 @@
  * @author lwh
  * @date 2023-10-21
  */
-public interface BizQualitySupervisionRepMapper extends GeneralApprovalMapper<BizQualitySupervisionRep, BizQualitySupervisionRep, BizQualitySupervisionRepVO> {
+public interface BizQualitySupervisionRepMapper extends GeneralApprovalMapper<BizQualitySupervisionRep, BizQualitySupervisionRep, BizQualitySupervisionRepVO>,IBaseSelectMaxMapper {
     /**
      * 质量监督报告 分页检索
      */
@@ -34,5 +34,5 @@
      * @param query 检索条件
      * @return
      */
-    Long selectMaxNo(@Param("ew") QueryWrapper<BizQualitySupervisionRecord> query);
+//    Long selectMaxNo(@Param("ew") QueryWrapper<BizQualitySupervisionRecord> query);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml
index 948c0f1..a59999d 100644
--- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml
@@ -61,14 +61,14 @@
         </where>
         order by a.create_time desc
     </select>
-    <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(file_code, 3)), 0) from biz_quality_non_conformance_rep
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
+<!--    <select id="selectMaxNo" resultType="java.lang.Long">-->
+<!--        SELECT IFNULL(max(RIGHT(file_code, 3)), 0) from biz_quality_non_conformance_rep-->
+<!--        <where>-->
+<!--            <if test="ew != null">-->
+<!--                ${ew.sqlSegment}-->
+<!--            </if>-->
+<!--        </where>-->
+<!--    </select>-->
     <select id="selectBatchForApprovalList" resultType="com.casic.missiles.model.quality.BizQualityNonConformanceRep">
         select
         a.id ,
diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml
index c87cd92..98911dd 100644
--- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml
@@ -65,14 +65,14 @@
         </where>
         order by a.create_time desc
     </select>
-    <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(file_code, 3)), 0) from biz_quality_supervision_rep
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
+<!--    <select id="selectMaxNo" resultType="java.lang.Long">-->
+<!--        SELECT IFNULL(max(RIGHT(file_code, 3)), 0) from biz_quality_supervision_rep-->
+<!--        <where>-->
+<!--            <if test="ew != null">-->
+<!--                ${ew.sqlSegment}-->
+<!--            </if>-->
+<!--        </where>-->
+<!--    </select>-->
     <select id="selectBatchForApprovalList" resultType="com.casic.missiles.model.quality.BizQualitySupervisionRep">
         select a.id,
         a.create_time as createTime,

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
index 9dc9fca..8377cdb 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
@@ -6,11 +6,11 @@
  * @Date: 2023/8/10 19:40
  */
 public enum QualityTableEnum {
+    //质量监督
     SUPERVISION_RECORD("biz_quality_supervision_record", "监督记录", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_01, 15),
-    NON_CONFORMANCE_REP("biz_quality_non_conformance_rep", "不符合情况分析报告", "file_code", QualityFileNoEnum.TYPE_208, QualityFileTypeEnum.TYPE_01, 15),
-    /**
-     * 纠正措施处理单
-     */
+    SUPERVISION_RECORD_REP("biz_quality_supervision_record", "监督记录报告", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_02, 15),
+    NON_CONFORMANCE_REP("biz_quality_non_conformance_rep", "不符合情况分析报告", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_03, 15),
+    //纠正 预防
     CORRECTIVE_RECORD("biz_quality_corrective_record", "纠正措施处理单", "file_code", QualityFileNoEnum.TYPE_207, QualityFileTypeEnum.TYPE_01, 13),
     PREVENT_RECORD("biz_quality_prevent_record", "预防措施表", "file_code", QualityFileNoEnum.TYPE_208, QualityFileTypeEnum.TYPE_01, 13),
     //内审
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java
index c2120ce..9836fce 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java
@@ -20,7 +20,7 @@
  * @author lwh
  * @date 2023-10-21
  */
-public interface BizQualityNonConformanceRepMapper extends GeneralApprovalMapper<BizQualityNonConformanceRep, BizQualityNonConformanceRep, BizQualityNonConformanceRepVO>{
+public interface BizQualityNonConformanceRepMapper extends GeneralApprovalMapper<BizQualityNonConformanceRep, BizQualityNonConformanceRep, BizQualityNonConformanceRepVO>,IBaseSelectMaxMapper{
     /**
      * 质量活动不符合情况分析报告 分页检索
      */
@@ -42,5 +42,5 @@
      * @param query 检索条件
      * @return
      */
-    Long selectMaxNo(@Param("ew") QueryWrapper<BizQualitySupervisionRecord> query);
+//    Long selectMaxNo(@Param("ew") QueryWrapper<BizQualitySupervisionRecord> query);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java
index a6cf561..bdf7c4e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java
@@ -20,7 +20,7 @@
  * @author lwh
  * @date 2023-10-21
  */
-public interface BizQualitySupervisionRepMapper extends GeneralApprovalMapper<BizQualitySupervisionRep, BizQualitySupervisionRep, BizQualitySupervisionRepVO> {
+public interface BizQualitySupervisionRepMapper extends GeneralApprovalMapper<BizQualitySupervisionRep, BizQualitySupervisionRep, BizQualitySupervisionRepVO>,IBaseSelectMaxMapper {
     /**
      * 质量监督报告 分页检索
      */
@@ -34,5 +34,5 @@
      * @param query 检索条件
      * @return
      */
-    Long selectMaxNo(@Param("ew") QueryWrapper<BizQualitySupervisionRecord> query);
+//    Long selectMaxNo(@Param("ew") QueryWrapper<BizQualitySupervisionRecord> query);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml
index 948c0f1..a59999d 100644
--- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml
@@ -61,14 +61,14 @@
         </where>
         order by a.create_time desc
     </select>
-    <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(file_code, 3)), 0) from biz_quality_non_conformance_rep
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
+<!--    <select id="selectMaxNo" resultType="java.lang.Long">-->
+<!--        SELECT IFNULL(max(RIGHT(file_code, 3)), 0) from biz_quality_non_conformance_rep-->
+<!--        <where>-->
+<!--            <if test="ew != null">-->
+<!--                ${ew.sqlSegment}-->
+<!--            </if>-->
+<!--        </where>-->
+<!--    </select>-->
     <select id="selectBatchForApprovalList" resultType="com.casic.missiles.model.quality.BizQualityNonConformanceRep">
         select
         a.id ,
diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml
index c87cd92..98911dd 100644
--- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml
@@ -65,14 +65,14 @@
         </where>
         order by a.create_time desc
     </select>
-    <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(file_code, 3)), 0) from biz_quality_supervision_rep
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
+<!--    <select id="selectMaxNo" resultType="java.lang.Long">-->
+<!--        SELECT IFNULL(max(RIGHT(file_code, 3)), 0) from biz_quality_supervision_rep-->
+<!--        <where>-->
+<!--            <if test="ew != null">-->
+<!--                ${ew.sqlSegment}-->
+<!--            </if>-->
+<!--        </where>-->
+<!--    </select>-->
     <select id="selectBatchForApprovalList" resultType="com.casic.missiles.model.quality.BizQualitySupervisionRep">
         select a.id,
         a.create_time as createTime,
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java
index 05e590c..37a8a85 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.core.base.json.DateDeserializer;
 import com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.model.quality.base.IBaseFileCodeModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -23,7 +24,7 @@
  */
 @Data
 @TableName("biz_quality_non_conformance_rep")
-public class BizQualityNonConformanceRep extends BaseRequest implements IBaseDataValid<BizQualityNonConformanceRep> {
+public class BizQualityNonConformanceRep extends BaseRequest implements IBaseDataValid<BizQualityNonConformanceRep>, IBaseFileCodeModel {
     private static final long serialVersionUID = 1L;
 
     /**

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
index 9dc9fca..8377cdb 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
@@ -6,11 +6,11 @@
  * @Date: 2023/8/10 19:40
  */
 public enum QualityTableEnum {
+    //质量监督
     SUPERVISION_RECORD("biz_quality_supervision_record", "监督记录", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_01, 15),
-    NON_CONFORMANCE_REP("biz_quality_non_conformance_rep", "不符合情况分析报告", "file_code", QualityFileNoEnum.TYPE_208, QualityFileTypeEnum.TYPE_01, 15),
-    /**
-     * 纠正措施处理单
-     */
+    SUPERVISION_RECORD_REP("biz_quality_supervision_record", "监督记录报告", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_02, 15),
+    NON_CONFORMANCE_REP("biz_quality_non_conformance_rep", "不符合情况分析报告", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_03, 15),
+    //纠正 预防
     CORRECTIVE_RECORD("biz_quality_corrective_record", "纠正措施处理单", "file_code", QualityFileNoEnum.TYPE_207, QualityFileTypeEnum.TYPE_01, 13),
     PREVENT_RECORD("biz_quality_prevent_record", "预防措施表", "file_code", QualityFileNoEnum.TYPE_208, QualityFileTypeEnum.TYPE_01, 13),
     //内审
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java
index c2120ce..9836fce 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java
@@ -20,7 +20,7 @@
  * @author lwh
  * @date 2023-10-21
  */
-public interface BizQualityNonConformanceRepMapper extends GeneralApprovalMapper<BizQualityNonConformanceRep, BizQualityNonConformanceRep, BizQualityNonConformanceRepVO>{
+public interface BizQualityNonConformanceRepMapper extends GeneralApprovalMapper<BizQualityNonConformanceRep, BizQualityNonConformanceRep, BizQualityNonConformanceRepVO>,IBaseSelectMaxMapper{
     /**
      * 质量活动不符合情况分析报告 分页检索
      */
@@ -42,5 +42,5 @@
      * @param query 检索条件
      * @return
      */
-    Long selectMaxNo(@Param("ew") QueryWrapper<BizQualitySupervisionRecord> query);
+//    Long selectMaxNo(@Param("ew") QueryWrapper<BizQualitySupervisionRecord> query);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java
index a6cf561..bdf7c4e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java
@@ -20,7 +20,7 @@
  * @author lwh
  * @date 2023-10-21
  */
-public interface BizQualitySupervisionRepMapper extends GeneralApprovalMapper<BizQualitySupervisionRep, BizQualitySupervisionRep, BizQualitySupervisionRepVO> {
+public interface BizQualitySupervisionRepMapper extends GeneralApprovalMapper<BizQualitySupervisionRep, BizQualitySupervisionRep, BizQualitySupervisionRepVO>,IBaseSelectMaxMapper {
     /**
      * 质量监督报告 分页检索
      */
@@ -34,5 +34,5 @@
      * @param query 检索条件
      * @return
      */
-    Long selectMaxNo(@Param("ew") QueryWrapper<BizQualitySupervisionRecord> query);
+//    Long selectMaxNo(@Param("ew") QueryWrapper<BizQualitySupervisionRecord> query);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml
index 948c0f1..a59999d 100644
--- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml
@@ -61,14 +61,14 @@
         </where>
         order by a.create_time desc
     </select>
-    <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(file_code, 3)), 0) from biz_quality_non_conformance_rep
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
+<!--    <select id="selectMaxNo" resultType="java.lang.Long">-->
+<!--        SELECT IFNULL(max(RIGHT(file_code, 3)), 0) from biz_quality_non_conformance_rep-->
+<!--        <where>-->
+<!--            <if test="ew != null">-->
+<!--                ${ew.sqlSegment}-->
+<!--            </if>-->
+<!--        </where>-->
+<!--    </select>-->
     <select id="selectBatchForApprovalList" resultType="com.casic.missiles.model.quality.BizQualityNonConformanceRep">
         select
         a.id ,
diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml
index c87cd92..98911dd 100644
--- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml
@@ -65,14 +65,14 @@
         </where>
         order by a.create_time desc
     </select>
-    <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(file_code, 3)), 0) from biz_quality_supervision_rep
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
+<!--    <select id="selectMaxNo" resultType="java.lang.Long">-->
+<!--        SELECT IFNULL(max(RIGHT(file_code, 3)), 0) from biz_quality_supervision_rep-->
+<!--        <where>-->
+<!--            <if test="ew != null">-->
+<!--                ${ew.sqlSegment}-->
+<!--            </if>-->
+<!--        </where>-->
+<!--    </select>-->
     <select id="selectBatchForApprovalList" resultType="com.casic.missiles.model.quality.BizQualitySupervisionRep">
         select a.id,
         a.create_time as createTime,
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java
index 05e590c..37a8a85 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.core.base.json.DateDeserializer;
 import com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.model.quality.base.IBaseFileCodeModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -23,7 +24,7 @@
  */
 @Data
 @TableName("biz_quality_non_conformance_rep")
-public class BizQualityNonConformanceRep extends BaseRequest implements IBaseDataValid<BizQualityNonConformanceRep> {
+public class BizQualityNonConformanceRep extends BaseRequest implements IBaseDataValid<BizQualityNonConformanceRep>, IBaseFileCodeModel {
     private static final long serialVersionUID = 1L;
 
     /**
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java
index 1133ea5..e3ec994 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java
@@ -18,12 +18,14 @@
 import com.casic.missiles.enums.quality.QualityDictTypeEnum;
 import com.casic.missiles.enums.quality.QualityFileNoEnum;
 import com.casic.missiles.enums.quality.QualityFileTypeEnum;
+import com.casic.missiles.enums.quality.QualityTableEnum;
 import com.casic.missiles.enums.resource.LabCodeDictEnum;
 import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper;
 import com.casic.missiles.model.quality.*;
 import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
 import com.casic.missiles.service.quality.*;
+import com.casic.missiles.service.quality.base.IBaseFileCodeService;
 import com.casic.missiles.utils.NoGeneratorUtil;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -43,7 +45,7 @@
  * @date 2023-10-21
  */
 @Service
-public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl<BizQualityNonConformanceRepMapper, BizQualityNonConformanceRep, BizQualityNonConformanceRep, BizQualityNonConformanceRepVO, BaseApprovalSubmitRequest> implements IBizQualityNonConformanceRepService {
+public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl<BizQualityNonConformanceRepMapper, BizQualityNonConformanceRep, BizQualityNonConformanceRep, BizQualityNonConformanceRepVO, BaseApprovalSubmitRequest> implements IBizQualityNonConformanceRepService, IBaseFileCodeService<BizQualityNonConformanceRep> {
     private final AbstractPermissionContext permissionContext;
     /**
      * 监督记录
@@ -153,7 +155,6 @@
 
         //根据不符合报告查询 纠正 预防整改措施
         for (BizQualityNonConformanceRep rep : list) {
-
             //关联问题文件查询
             QueryWrapper<BizQualityNonConformanceFileRel> fileRelQuery = new QueryWrapper<>();
             fileRelQuery.eq("non_conformance_id", rep.getId());
@@ -178,52 +179,20 @@
         entity.setUpdateTime(new Date());
         entity.setCreatorName(user.getName());
 
-        String labCode = entity.getBizLabCode();
-        if (LabCodeDictEnum.A.getCode().equals(entity.getBizLabCode())) {
-            labCode = relDeptService.getByDeptId(entity.getDeptId()).getBizLabCode();
-        }
-
-        String newCode = genCode(labCode, entity.getGroupNo());
-        entity.setFileCode(newCode);
-        entity.setSysCode(newCode);
+        saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode));
         entity.setApprovalStatus(ApprovalStatusEnum.DRAFT);
-
         super.save(entity);
         //关联附件保存
         fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId());
         return true;
     }
 
-    /**
-     * 不符合分析报告编码生成
-     *
-     * @param labCode 实验室代码
-     * @param groupNo 分组
-     * @return
-     */
-    private String genCode(String labCode, String groupNo) {
-
-        String code = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), labCode, QualityFileTypeEnum.TYPE_03.getCode(), groupNo, 0l);
-        QueryWrapper<BizQualitySupervisionRecord> query = new QueryWrapper<>();
-        //检索最大编码
-        query.like("file_code", code.substring(0, 15));
-        Long maxNo = this.baseMapper.selectMaxNo(query);
-        String newCode = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), labCode, QualityFileTypeEnum.TYPE_03.getCode(), groupNo, maxNo);
-
-        return newCode;
-    }
 
     @Transactional
     @Override
     public boolean updateById(BizQualityNonConformanceRep entity) {
         BizQualityNonConformanceRep oldRep = getById(entity.getId());
-        if (!oldRep.getBizLabCode().equals(entity.getBizLabCode())) {
-            //更新系统编码
-            String newCode = genCode(entity.getBizLabCode(), entity.getGroupNo());
-            entity.setFileCode(newCode);
-            entity.setSysCode(newCode);
-        }
-
+        updateEntity(entity,oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode));
         entity.setUpdateTime(new Date());
         fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId());
         return super.updateById(entity);

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
index 9dc9fca..8377cdb 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/quality/QualityTableEnum.java
@@ -6,11 +6,11 @@
  * @Date: 2023/8/10 19:40
  */
 public enum QualityTableEnum {
+    //质量监督
     SUPERVISION_RECORD("biz_quality_supervision_record", "监督记录", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_01, 15),
-    NON_CONFORMANCE_REP("biz_quality_non_conformance_rep", "不符合情况分析报告", "file_code", QualityFileNoEnum.TYPE_208, QualityFileTypeEnum.TYPE_01, 15),
-    /**
-     * 纠正措施处理单
-     */
+    SUPERVISION_RECORD_REP("biz_quality_supervision_record", "监督记录报告", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_02, 15),
+    NON_CONFORMANCE_REP("biz_quality_non_conformance_rep", "不符合情况分析报告", "file_code", QualityFileNoEnum.TYPE_206, QualityFileTypeEnum.TYPE_03, 15),
+    //纠正 预防
     CORRECTIVE_RECORD("biz_quality_corrective_record", "纠正措施处理单", "file_code", QualityFileNoEnum.TYPE_207, QualityFileTypeEnum.TYPE_01, 13),
     PREVENT_RECORD("biz_quality_prevent_record", "预防措施表", "file_code", QualityFileNoEnum.TYPE_208, QualityFileTypeEnum.TYPE_01, 13),
     //内审
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java
index c2120ce..9836fce 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualityNonConformanceRepMapper.java
@@ -20,7 +20,7 @@
  * @author lwh
  * @date 2023-10-21
  */
-public interface BizQualityNonConformanceRepMapper extends GeneralApprovalMapper<BizQualityNonConformanceRep, BizQualityNonConformanceRep, BizQualityNonConformanceRepVO>{
+public interface BizQualityNonConformanceRepMapper extends GeneralApprovalMapper<BizQualityNonConformanceRep, BizQualityNonConformanceRep, BizQualityNonConformanceRepVO>,IBaseSelectMaxMapper{
     /**
      * 质量活动不符合情况分析报告 分页检索
      */
@@ -42,5 +42,5 @@
      * @param query 检索条件
      * @return
      */
-    Long selectMaxNo(@Param("ew") QueryWrapper<BizQualitySupervisionRecord> query);
+//    Long selectMaxNo(@Param("ew") QueryWrapper<BizQualitySupervisionRecord> query);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java
index a6cf561..bdf7c4e 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/quality/BizQualitySupervisionRepMapper.java
@@ -20,7 +20,7 @@
  * @author lwh
  * @date 2023-10-21
  */
-public interface BizQualitySupervisionRepMapper extends GeneralApprovalMapper<BizQualitySupervisionRep, BizQualitySupervisionRep, BizQualitySupervisionRepVO> {
+public interface BizQualitySupervisionRepMapper extends GeneralApprovalMapper<BizQualitySupervisionRep, BizQualitySupervisionRep, BizQualitySupervisionRepVO>,IBaseSelectMaxMapper {
     /**
      * 质量监督报告 分页检索
      */
@@ -34,5 +34,5 @@
      * @param query 检索条件
      * @return
      */
-    Long selectMaxNo(@Param("ew") QueryWrapper<BizQualitySupervisionRecord> query);
+//    Long selectMaxNo(@Param("ew") QueryWrapper<BizQualitySupervisionRecord> query);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml
index 948c0f1..a59999d 100644
--- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityNonConformanceRepMapper.xml
@@ -61,14 +61,14 @@
         </where>
         order by a.create_time desc
     </select>
-    <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(file_code, 3)), 0) from biz_quality_non_conformance_rep
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
+<!--    <select id="selectMaxNo" resultType="java.lang.Long">-->
+<!--        SELECT IFNULL(max(RIGHT(file_code, 3)), 0) from biz_quality_non_conformance_rep-->
+<!--        <where>-->
+<!--            <if test="ew != null">-->
+<!--                ${ew.sqlSegment}-->
+<!--            </if>-->
+<!--        </where>-->
+<!--    </select>-->
     <select id="selectBatchForApprovalList" resultType="com.casic.missiles.model.quality.BizQualityNonConformanceRep">
         select
         a.id ,
diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml
index c87cd92..98911dd 100644
--- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualitySupervisionRepMapper.xml
@@ -65,14 +65,14 @@
         </where>
         order by a.create_time desc
     </select>
-    <select id="selectMaxNo" resultType="java.lang.Long">
-        SELECT IFNULL(max(RIGHT(file_code, 3)), 0) from biz_quality_supervision_rep
-        <where>
-            <if test="ew != null">
-                ${ew.sqlSegment}
-            </if>
-        </where>
-    </select>
+<!--    <select id="selectMaxNo" resultType="java.lang.Long">-->
+<!--        SELECT IFNULL(max(RIGHT(file_code, 3)), 0) from biz_quality_supervision_rep-->
+<!--        <where>-->
+<!--            <if test="ew != null">-->
+<!--                ${ew.sqlSegment}-->
+<!--            </if>-->
+<!--        </where>-->
+<!--    </select>-->
     <select id="selectBatchForApprovalList" resultType="com.casic.missiles.model.quality.BizQualitySupervisionRep">
         select a.id,
         a.create_time as createTime,
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java
index 05e590c..37a8a85 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityNonConformanceRep.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.constants.MeterDictCode;
 import com.casic.missiles.core.base.json.DateDeserializer;
 import com.casic.missiles.dto.BaseRequest;
+import com.casic.missiles.model.quality.base.IBaseFileCodeModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -23,7 +24,7 @@
  */
 @Data
 @TableName("biz_quality_non_conformance_rep")
-public class BizQualityNonConformanceRep extends BaseRequest implements IBaseDataValid<BizQualityNonConformanceRep> {
+public class BizQualityNonConformanceRep extends BaseRequest implements IBaseDataValid<BizQualityNonConformanceRep>, IBaseFileCodeModel {
     private static final long serialVersionUID = 1L;
 
     /**
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java
index 1133ea5..e3ec994 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityNonConformanceRepServiceImpl.java
@@ -18,12 +18,14 @@
 import com.casic.missiles.enums.quality.QualityDictTypeEnum;
 import com.casic.missiles.enums.quality.QualityFileNoEnum;
 import com.casic.missiles.enums.quality.QualityFileTypeEnum;
+import com.casic.missiles.enums.quality.QualityTableEnum;
 import com.casic.missiles.enums.resource.LabCodeDictEnum;
 import com.casic.missiles.enums.system.ApprovalStatusEnum;
 import com.casic.missiles.mapper.quality.BizQualityNonConformanceRepMapper;
 import com.casic.missiles.model.quality.*;
 import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
 import com.casic.missiles.service.quality.*;
+import com.casic.missiles.service.quality.base.IBaseFileCodeService;
 import com.casic.missiles.utils.NoGeneratorUtil;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -43,7 +45,7 @@
  * @date 2023-10-21
  */
 @Service
-public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl<BizQualityNonConformanceRepMapper, BizQualityNonConformanceRep, BizQualityNonConformanceRep, BizQualityNonConformanceRepVO, BaseApprovalSubmitRequest> implements IBizQualityNonConformanceRepService {
+public class BizQualityNonConformanceRepServiceImpl extends GeneralApprovalServiceImpl<BizQualityNonConformanceRepMapper, BizQualityNonConformanceRep, BizQualityNonConformanceRep, BizQualityNonConformanceRepVO, BaseApprovalSubmitRequest> implements IBizQualityNonConformanceRepService, IBaseFileCodeService<BizQualityNonConformanceRep> {
     private final AbstractPermissionContext permissionContext;
     /**
      * 监督记录
@@ -153,7 +155,6 @@
 
         //根据不符合报告查询 纠正 预防整改措施
         for (BizQualityNonConformanceRep rep : list) {
-
             //关联问题文件查询
             QueryWrapper<BizQualityNonConformanceFileRel> fileRelQuery = new QueryWrapper<>();
             fileRelQuery.eq("non_conformance_id", rep.getId());
@@ -178,52 +179,20 @@
         entity.setUpdateTime(new Date());
         entity.setCreatorName(user.getName());
 
-        String labCode = entity.getBizLabCode();
-        if (LabCodeDictEnum.A.getCode().equals(entity.getBizLabCode())) {
-            labCode = relDeptService.getByDeptId(entity.getDeptId()).getBizLabCode();
-        }
-
-        String newCode = genCode(labCode, entity.getGroupNo());
-        entity.setFileCode(newCode);
-        entity.setSysCode(newCode);
+        saveEntity(entity, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode));
         entity.setApprovalStatus(ApprovalStatusEnum.DRAFT);
-
         super.save(entity);
         //关联附件保存
         fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId());
         return true;
     }
 
-    /**
-     * 不符合分析报告编码生成
-     *
-     * @param labCode 实验室代码
-     * @param groupNo 分组
-     * @return
-     */
-    private String genCode(String labCode, String groupNo) {
-
-        String code = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), labCode, QualityFileTypeEnum.TYPE_03.getCode(), groupNo, 0l);
-        QueryWrapper<BizQualitySupervisionRecord> query = new QueryWrapper<>();
-        //检索最大编码
-        query.like("file_code", code.substring(0, 15));
-        Long maxNo = this.baseMapper.selectMaxNo(query);
-        String newCode = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), labCode, QualityFileTypeEnum.TYPE_03.getCode(), groupNo, maxNo);
-
-        return newCode;
-    }
 
     @Transactional
     @Override
     public boolean updateById(BizQualityNonConformanceRep entity) {
         BizQualityNonConformanceRep oldRep = getById(entity.getId());
-        if (!oldRep.getBizLabCode().equals(entity.getBizLabCode())) {
-            //更新系统编码
-            String newCode = genCode(entity.getBizLabCode(), entity.getGroupNo());
-            entity.setFileCode(newCode);
-            entity.setSysCode(newCode);
-        }
-
+        updateEntity(entity,oldRep, QualityTableEnum.NON_CONFORMANCE_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode));
         entity.setUpdateTime(new Date());
         fileRelService.saveOrUpdateList(entity.getConformanceFileRels(), entity.getId());
         return super.updateById(entity);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java
index 84449f9..997d4ce 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRepServiceImpl.java
@@ -17,11 +17,13 @@
 import com.casic.missiles.enums.quality.QualityDictTypeEnum;
 import com.casic.missiles.enums.quality.QualityFileNoEnum;
 import com.casic.missiles.enums.quality.QualityFileTypeEnum;
+import com.casic.missiles.enums.quality.QualityTableEnum;
 import com.casic.missiles.enums.resource.LabCodeDictEnum;
 import com.casic.missiles.mapper.quality.BizQualitySupervisionRepMapper;
 import com.casic.missiles.model.quality.*;
 import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl;
 import com.casic.missiles.service.quality.*;
+import com.casic.missiles.service.quality.base.IBaseFileCodeService;
 import com.casic.missiles.utils.NoGeneratorUtil;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -42,7 +44,7 @@
  * @date 2023-10-21
  */
 @Service
-public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl<BizQualitySupervisionRepMapper, BizQualitySupervisionRep, BizQualitySupervisionRep, BizQualitySupervisionRepVO, BaseApprovalSubmitRequest> implements IBizQualitySupervisionRepService {
+public class BizQualitySupervisionRepServiceImpl extends GeneralApprovalServiceImpl<BizQualitySupervisionRepMapper, BizQualitySupervisionRep, BizQualitySupervisionRep, BizQualitySupervisionRepVO, BaseApprovalSubmitRequest> implements IBizQualitySupervisionRepService, IBaseFileCodeService<BizQualitySupervisionRep> {
     private final IBizQualityRepRelService bizQualityRepRelService;
     private final AbstractPermissionContext permissionContext;
     private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService;
@@ -147,24 +149,12 @@
         rep.setSupDepName(permissionContext.getDeptService().getDeptName(rep.getSupDepId()));
         rep.setBizLabCodeName(dictService.getDictNameByCode(MeterDictCode.LAB_CODE, rep.getBizLabCode()));
     }
-
+    @Transactional
     @Override
     public boolean save(BizQualitySupervisionRep entity) {
+        //设置最大编码
+        saveEntity(entity,entity.getGroupNo(), QualityTableEnum.SUPERVISION_RECORD_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode));
 
-        String labCode = entity.getBizLabCode();
-        if (LabCodeDictEnum.A.getCode().equals(entity.getBizLabCode())) {
-            labCode = relDeptService.getByDeptId(entity.getSupDepId()).getBizLabCode();
-        }
-
-        QueryWrapper<BizQualitySupervisionRecord> query = new QueryWrapper<>();
-        String code = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), labCode, QualityFileTypeEnum.TYPE_02.getCode(), entity.getGroupNo(), 0l);
-        //检索最大编码
-        String queryCode = code.substring(0, 15);
-        query.like("file_code", queryCode);
-        Long maxNo = this.baseMapper.selectMaxNo(query);
-        String newCode = NoGeneratorUtil.getCode(QualityFileNoEnum.TYPE_206.getCode(), labCode, QualityFileTypeEnum.TYPE_02.getCode(), entity.getGroupNo(), maxNo);
-        entity.setFileCode(newCode);
-        entity.setSysCode(newCode);
         entity.setCreateTime(new Date());
         entity.setUpdateTime(new Date());
         AuthUser user = permissionContext.getAuthService().getLoginUser();
@@ -194,9 +184,12 @@
             bizQualityRepRelService.saveBatch(rels);
         }
     }
-
+    @Transactional
     @Override
     public boolean updateById(BizQualitySupervisionRep entity) {
+        BizQualitySupervisionRep oldEntity = getById(entity.getId());
+        updateEntity(entity,entity.getGroupNo(),oldEntity, QualityTableEnum.SUPERVISION_RECORD_REP, (tableEnum, queryCode) -> this.baseMapper.selectMaxNo(tableEnum.getCode(), tableEnum.getColumn(), queryCode));
+
         super.updateById(entity);
         QueryWrapper<BizQualityRepRel> query = new QueryWrapper<>();
         query.eq("rep_id", entity.getId());