diff --git a/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java b/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java
index d090584..2434b22 100644
--- a/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java
+++ b/src/main/java/com/xujie/sys/modules/pms/controller/QcController.java
@@ -19,11 +19,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.util.*;
 
-/**
- * @description: 质量管理控制层
- * @author: fengyuan_yang
- * @date: 2023/3/20 17:02
- **/
 @RestController
 @RequestMapping("/pms/qc")
 public class QcController {
@@ -37,11 +32,7 @@ public class QcController {
     // ======================= 检验方法API =======================
 
     /**
-     * @description: 条件查询检验方法
-     * @author: fengyuan_yang
-     * @date: 2023/3/24 11:28
-     * @param: [data]
-     * @return: java.util.Map<java.lang.String,java.lang.Object>
+     * 条件查询检验方法
      **/
     @PostMapping("/qcMethodSearch")
     public R qcMethodSearch(@RequestBody QcMethodData data){
@@ -50,11 +41,7 @@ public class QcController {
     }
 
     /**
-     * @description: 新增检验方法
-     * @author: fengyuan_yang
-     * @date: 2023/3/24 11:30
-     * @param: [data]
-     * @return: com.xujie.sys.modules.pms.util.ResponseData
+     * 新增检验方法
      **/
     @PostMapping(value="/qcMethodSave")
     public R qcMethodSave (@RequestBody QcMethodData data) {
@@ -63,11 +50,7 @@ public class QcController {
     }
 
     /**
-     * @description: 修改检验方法
-     * @author: fengyuan_yang
-     * @date: 2023/3/24 11:31
-     * @param: [data]
-     * @return: com.xujie.sys.modules.pms.util.ResponseData
+     * 修改检验方法
      **/
     @PostMapping(value="/qcMethodUpdate")
     public R qcMethodUpdate(@RequestBody QcMethodData data){
@@ -76,11 +59,7 @@ public class QcController {
     }
 
     /**
-     * @description: 删除检验方法
-     * @author: fengyuan_yang
-     * @date: 2023/3/24 11:32
-     * @param: [data]
-     * @return: com.xujie.sys.modules.pms.util.ResponseData
+     * 删除检验方法
      **/
     @PostMapping(value="/qcMethodDelete")
     @ResponseBody
@@ -92,11 +71,7 @@ public class QcController {
     // ======================= 检验项目API =======================
 
     /**
-     * @description: 查询检验项目
-     * @author: fengyuan_yang
-     * @date: 2023/3/20 17:03
-     * @param: [data]
-     * @return: java.lang.Object
+     * 查询检验项目
      **/
     @PostMapping(value="/qcItemSearch")
     public R qcItemSearch(@RequestBody QcItemData data){
@@ -105,11 +80,7 @@ public class QcController {
     }
 
     /**
-     * @description: 新增检验项目
-     * @author: fengyuan_yang
-     * @date: 2023/3/20 21:46
-     * @param: [data]
-     * @return: java.lang.Object
+     * 新增检验项目
      **/
     @PostMapping(value="/qcItemSave")
     public R qcItemSave(@RequestBody QcItemData data){
@@ -118,11 +89,7 @@ public class QcController {
     }
 
     /**
-     * @description: 修改检验项目
-     * @author: fengyuan_yang
-     * @date: 2023/3/20 22:27
-     * @param: [data]
-     * @return: java.lang.Object
+     * 修改检验项目
      **/
     @PostMapping(value="/qcItemUpdate")
     @ResponseBody
@@ -132,11 +99,7 @@ public class QcController {
     }
 
     /**
-     * @description: 删除检验项目
-     * @author: fengyuan_yang
-     * @date: 2023/3/20 23:12
-     * @param: [data]
-     * @return: java.lang.Object
+     * 删除检验项目
      **/
     @PostMapping(value="/qcItemDelete")
     @ResponseBody
@@ -146,11 +109,7 @@ public class QcController {
     }
 
     /**
-     * @description: 检验项目导入
-     * @author: fengyuan_yang
-     * @date: 2023/4/15 12:58
-     * @param: [file]
-     * @return: com.xujie.sys.common.utils.R
+     * 检验项目导入
      **/
     @PostMapping("/uploadExcel")
     public R taskUploadExcel(@RequestParam(value = "file") MultipartFile file, @ModelAttribute GetParamInData data){
@@ -161,11 +120,7 @@ public class QcController {
     // ======================= 根据物料设置检验模板API =======================
 
     /**
-     * @description: 快速获取模板列表
-     * @author: fengyuan_yang
-     * @date: 2023/3/30 11:29
-     * @param: [inData]
-     * @return: com.xujie.sys.common.utils.R
+     * 快速获取模板列表
      **/
     @PostMapping("/getItemLists")
     public R getItemLists(@RequestBody QcTemplateData data){
@@ -177,11 +132,7 @@ public class QcController {
     }
 
     /**
-     * @description: 物料属性设置模板新增
-     * @author: fengyuan_yang
-     * @date: 2023/7/9 22:55
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 物料属性设置模板新增
      **/
     @PostMapping("/getPartTemplateLists")
     public R getPartTemplateLists(@RequestBody QcTemplateData data){
@@ -196,11 +147,7 @@ public class QcController {
     // ======================= 质检员信息维护API =======================
 
     /**
-     * @description: 查询质检员信息列表
-     * @author: fengyuan_yang
-     * @date: 2023/3/31 8:48
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 查询质检员信息列表
      **/
     @PostMapping(value="/inspectorSearch")
     public R inspectorSearch(){
@@ -209,11 +156,7 @@ public class QcController {
     }
 
     /**
-     * @description: 新增质检员信息
-     * @author: fengyuan_yang
-     * @date: 2023/3/31 8:59
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 新增质检员信息
      **/
     @PostMapping("/inspectorSave")
     public ResponseData inspectorSave(@RequestBody QcInspectorData data){
@@ -228,11 +171,7 @@ public class QcController {
     }
 
     /**
-     * @description: 修改质检员信息
-     * @author: fengyuan_yang
-     * @date: 2023/3/31 9:03
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 修改质检员信息
      **/
     @PostMapping("/inspectorUpdate")
     public ResponseData inspectorUpdate(@RequestBody QcInspectorData data){
@@ -247,11 +186,7 @@ public class QcController {
     }
 
     /**
-     * @description: 删除质检员信息
-     * @author: fengyuan_yang
-     * @date: 2023/3/31 9:07
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 删除质检员信息
      **/
     @PostMapping("/inspectorDelete")
     public ResponseData inspectorDelete(@RequestBody QcInspectorData data){
@@ -269,11 +204,7 @@ public class QcController {
     // ======================= 样本量字码矩阵维护API =======================
 
     /**
-     * @description: 查询抽检方案
-     * @author: fengyuan_yang
-     * @date: 2023/4/7 16:14
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 查询抽检方案
      **/
     @PostMapping(value="/samplingInspectionPlanSearch")
     public R samplingInspectionPlanSearch(@RequestBody QcSamplingInspectionPlanData data){
@@ -282,11 +213,7 @@ public class QcController {
     }
 
     /**
-     * @description: 新增抽样方案
-     * @author: fengyuan_yang
-     * @date: 2023/4/10 9:48
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 新增抽样方案
      **/
     @PostMapping(value="/samplingInspectionPlanSave")
     public R samplingInspectionPlanSave(@RequestBody QcSamplingInspectionPlanData data){
@@ -295,11 +222,7 @@ public class QcController {
     }
 
     /**
-     * @description: 修改抽样方案
-     * @author: fengyuan_yang
-     * @date: 2023/4/10 12:58
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 修改抽样方案
      **/
     @PostMapping(value="/samplingInspectionPlanUpdate")
     public R samplingInspectionPlanUpdate(@RequestBody QcSamplingInspectionPlanData data){
@@ -308,11 +231,7 @@ public class QcController {
     }
 
     /**
-     * @description: 删除抽样方案
-     * @author: fengyuan_yang
-     * @date: 2023/4/10 13:02
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 删除抽样方案
      **/
     @PostMapping(value="/samplingInspectionPlanDelete")
     public R samplingInspectionPlanDelete(@RequestBody QcSamplingInspectionPlanData data){
@@ -323,11 +242,7 @@ public class QcController {
     // ======================= 检验模板API =======================
 
     /**
-     * @description: 查询模板
-     * @author: fengyuan_yang
-     * @date: 2023/4/10 15:55
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 查询模板
      **/
     @PostMapping(value="/templateSearch")
     public R templateSearch(@RequestBody QcTemplateData data){
@@ -336,11 +251,7 @@ public class QcController {
     }
 
     /**
-     * @description: 新增模板
-     * @author: fengyuan_yang
-     * @date: 2023/4/10 17:12
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 新增模板
      **/
     @PostMapping(value="/templateSave")
     public R templateSave(@RequestBody QcTemplateData data){
@@ -349,11 +260,7 @@ public class QcController {
     }
 
     /**
-     * @description: 修改模板
-     * @author: fengyuan_yang
-     * @date: 2023/4/10 17:38
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 修改模板
      **/
     @PostMapping(value="/templateUpdate")
     public R templateUpdate(@RequestBody QcTemplateData data){
@@ -362,11 +269,7 @@ public class QcController {
     }
 
     /**
-     * @description: 删除模板
-     * @author: fengyuan_yang
-     * @date: 2023/4/12 14:27
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 删除模板
      **/
     @PostMapping(value="/templateDelete")
     public R templateDelete(@RequestBody QcTemplateData data){
@@ -375,11 +278,7 @@ public class QcController {
     }
 
     /**
-     * @description: 搜索所有检验类型
-     * @author: fengyuan_yang
-     * @date: 2023/4/18 17:09
-     * @param: []
-     * @return: com.xujie.sys.common.utils.R
+     * 搜索所有检验类型
      **/
     @PostMapping(value="/inspectionTypeSearch")
     public R inspectionTypeSearch(@RequestBody QcInspectionTypeData data){
@@ -389,8 +288,6 @@ public class QcController {
 
     /**
      * 搜索所有检验项目类型
-     * @param data
-     * @return
      */
     @PostMapping(value="/itemTypeSearch")
     public R itemTypeSearch(@RequestBody QcItemTypeData data){
@@ -399,11 +296,7 @@ public class QcController {
     }
 
     /**
-     * @description: 搜索所有设备
-     * @author: fengyuan_yang
-     * @date: 2023/4/19 14:35
-     * @param: []
-     * @return: com.xujie.sys.common.utils.R
+     * 搜索所有设备
      **/
     @PostMapping(value="/objectSearch")
     public R objectSearch (@RequestBody EamObjectData data) {
@@ -412,11 +305,7 @@ public class QcController {
     }
 
     /**
-     * @description: 查询项目列表
-     * @author: fengyuan_yang
-     * @date: 2023/4/11 9:39
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 查询项目列表
      **/
     @PostMapping(value="/templateDetailsSearch")
     public R templateDetailsSearch(@RequestBody QcTemplateData data){
@@ -425,11 +314,7 @@ public class QcController {
     }
 
     /**
-     * @description: 新增模板的检验项目
-     * @author: fengyuan_yang
-     * @date: 2023/4/11 10:04
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 新增模板的检验项目
      **/
     @PostMapping("/addItemDetails")
     public R addItemDetails(@RequestBody QcTemplateData data){
@@ -438,11 +323,7 @@ public class QcController {
     }
 
     /**
-     * @description: 快速新增
-     * @author: fengyuan_yang
-     * @date: 2023/4/12 13:45
-     * @param: [inData]
-     * @return: com.xujie.sys.common.utils.R
+     * 快速新增
      **/
     @PostMapping("/getItemList")
     public R getItemList(@RequestBody QcTemplateData data){
@@ -454,11 +335,7 @@ public class QcController {
     }
 
     /**
-     * @description: 查询项目
-     * @author: fengyuan_yang
-     * @date: 2023/11/19 13:03
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 查询项目
      **/
     @PostMapping("/getItem")
     public R getItem(@RequestBody QcTemplateData data){
@@ -467,11 +344,7 @@ public class QcController {
     }
 
     /**
-     * @description: 删除模板的检验项目
-     * @author: fengyuan_yang
-     * @date: 2023/4/11 10:57
-     * @param: [inData]
-     * @return: com.xujie.sys.common.utils.R
+     * 删除模板的检验项目
      **/
     @PostMapping("/delItemDetails")
     public R delItemDetails(@RequestBody QcTemplateData data){
@@ -480,11 +353,7 @@ public class QcController {
     }
 
     /**
-     * @description: 新增项目明细的最大最小值
-     * @author: fengyuan_yang
-     * @date: 2023/4/16 17:26
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 新增项目明细的最大最小值
      **/
     @PostMapping("/saveItemDetailed")
     public R saveItemDetailed(@RequestBody QcTemplateData data){
@@ -493,11 +362,7 @@ public class QcController {
     }
 
     /**
-     * @description: 检验模板导入
-     * @author: fengyuan_yang
-     * @date: 2023/4/22 16:29
-     * @param: [file]
-     * @return: com.xujie.sys.common.utils.R
+     * 检验模板导入
      **/
     @PostMapping("/uploadTemplateExcel")
     public R uploadTemplateExcel(@RequestParam(value = "file") MultipartFile file, @ModelAttribute GetParamInData data){
@@ -505,15 +370,10 @@ public class QcController {
         return R.ok();
     }
 
-
     // ======================= 样本量API =======================
 
     /**
-     * @description: 查询样本量
-     * @author: fengyuan_yang
-     * @date: 2023/4/17 10:48
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 查询样本量
      **/
     @PostMapping("/samplingQtySearch")
     public R samplingQtySearch(@RequestBody QcSamplingInspectionQtyData data){
@@ -522,11 +382,7 @@ public class QcController {
     }
 
     /**
-     * @description: 新增样本量
-     * @author: fengyuan_yang
-     * @date: 2023/4/17 11:24
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 新增样本量
      **/
     @PostMapping("/samplingQtySave")
     public R samplingQtySave(@RequestBody QcSamplingInspectionQtyData data){
@@ -535,11 +391,7 @@ public class QcController {
     }
 
     /**
-     * @description: 修改样本量
-     * @author: fengyuan_yang
-     * @date: 2023/4/17 13:01
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 修改样本量
      **/
     @PostMapping("/samplingQtyUpdate")
     public R samplingQtyUpdate(@RequestBody QcSamplingInspectionQtyData data){
@@ -548,11 +400,7 @@ public class QcController {
     }
 
     /**
-     * @description: 删除样本量
-     * @author: fengyuan_yang
-     * @date: 2023/4/17 13:22
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 删除样本量
      **/
     @PostMapping("/samplingQtyDelete")
     public R samplingQtyDelete(@RequestBody QcSamplingInspectionQtyData data){
@@ -563,11 +411,7 @@ public class QcController {
     // ======================= 批量级次API =======================
 
     /**
-     * @description: 查询批量级次
-     * @author: fengyuan_yang
-     * @date: 2023/4/17 13:38
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 查询批量级次
      **/
     @PostMapping("/samplingQtyRankSearch")
     public R samplingQtyRankSearch(@RequestBody QcSamplingInspectionQtyRankData data){
@@ -576,11 +420,7 @@ public class QcController {
     }
 
     /**
-     * @description: 新增批量级次
-     * @author: fengyuan_yang
-     * @date: 2023/4/17 11:24
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 新增批量级次
      **/
     @PostMapping("/samplingQtyRankSave")
     public R samplingQtyRankSave(@RequestBody QcSamplingInspectionQtyRankData data){
@@ -589,11 +429,7 @@ public class QcController {
     }
 
     /**
-     * @description: 修改批量级次
-     * @author: fengyuan_yang
-     * @date: 2023/4/17 13:01
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 修改批量级次
      **/
     @PostMapping("/samplingQtyRankUpdate")
     public R samplingQtyRankUpdate(@RequestBody QcSamplingInspectionQtyRankData data){
@@ -602,11 +438,7 @@ public class QcController {
     }
 
     /**
-     * @description: 删除批量级次
-     * @author: fengyuan_yang
-     * @date: 2023/4/17 13:22
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 删除批量级次
      **/
     @PostMapping("/samplingQtyRankDelete")
     public R samplingQtyRankDelete(@RequestBody QcSamplingInspectionQtyRankData data){
@@ -617,11 +449,7 @@ public class QcController {
     // ======================= 检验等级API =======================
 
     /**
-     * @description: 查询检验等级
-     * @author: fengyuan_yang
-     * @date: 2023/4/17 13:38
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 查询检验等级
      **/
     @PostMapping("/samplingLevelSearch")
     public R samplingLevelSearch(@RequestBody QcSamplingInspectionLevelData data){
@@ -630,11 +458,7 @@ public class QcController {
     }
 
     /**
-     * @description: 新增检验等级
-     * @author: fengyuan_yang
-     * @date: 2023/4/17 11:24
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 新增检验等级
      **/
     @PostMapping("/samplingLevelSave")
     public R samplingLevelSave(@RequestBody QcSamplingInspectionLevelData data){
@@ -643,11 +467,7 @@ public class QcController {
     }
 
     /**
-     * @description: 修改检验等级
-     * @author: fengyuan_yang
-     * @date: 2023/4/17 13:01
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 修改检验等级
      **/
     @PostMapping("/samplingLevelUpdate")
     public R samplingLevelUpdate(@RequestBody QcSamplingInspectionLevelData data){
@@ -656,11 +476,7 @@ public class QcController {
     }
 
     /**
-     * @description: 删除检验等级
-     * @author: fengyuan_yang
-     * @date: 2023/4/17 13:22
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 删除检验等级
      **/
     @PostMapping("/samplingLevelDelete")
     public R samplingLevelDelete(@RequestBody QcSamplingInspectionLevelData data){
@@ -671,11 +487,7 @@ public class QcController {
     // ======================= 物料属性设置API =======================
 
     /**
-     * @description: 查询物料属性
-     * @author: fengyuan_yang
-     * @date: 2023/4/19 11:42
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 查询物料属性
      **/
     @PostMapping(value="/qcPartAttributeSearch")
     public R qcPartAttributeSearch(@RequestBody QcPartAttributeData data){
@@ -684,11 +496,7 @@ public class QcController {
     }
 
     /**
-     * @description: 新增物料属性
-     * @author: fengyuan_yang
-     * @date: 2023/4/19 17:14
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 新增物料属性
      **/
     @PostMapping("/qcPartAttributeSave")
     public R qcPartAttributeSave(@RequestBody QcPartAttributeData data){
@@ -697,11 +505,7 @@ public class QcController {
     }
 
     /**
-     * @description: 物料属性修改
-     * @author: fengyuan_yang
-     * @date: 2023/10/27 13:25
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 物料属性修改
      **/
     @PostMapping("/qcPartAttributeEdit")
     public R qcPartAttributeEdit(@RequestBody QcPartAttributeData data){
@@ -710,11 +514,7 @@ public class QcController {
     }
 
     /**
-     * @description: 删除物料属性
-     * @author: fengyuan_yang
-     * @date: 2023/4/20 16:42
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 删除物料属性
      **/
     @PostMapping("/qcPartAttributeDelete")
     public R qcPartAttributeDelete(@RequestBody QcPartAttributeData data){
@@ -723,11 +523,7 @@ public class QcController {
     }
 
     /**
-     * @description: 查询物料模板
-     * @author: fengyuan_yang
-     * @date: 2023/4/19 17:50
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 查询物料模板
      **/
     @PostMapping("/searchPartAttributeDetails")
     public R searchPartAttributeDetails(@RequestBody QcTemplateData data){
@@ -736,11 +532,7 @@ public class QcController {
     }
 
     /**
-     * @description: 新增物料属性模板
-     * @author: fengyuan_yang
-     * @date: 2023/4/20 9:33
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 新增物料属性模板
      **/
     @PostMapping("/savePartAttributeDetails")
     public R savePartAttributeDetails(@RequestBody QcTemplateData data){
@@ -749,11 +541,7 @@ public class QcController {
     }
 
     /**
-     * @description: 删除物料属性模板
-     * @author: fengyuan_yang
-     * @date: 2023/4/20 13:10
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 删除物料属性模板
      **/
     @PostMapping("/deletePartAttributeDetails")
     public R deletePartAttributeDetails(@RequestBody QcTemplateData data){
@@ -762,11 +550,7 @@ public class QcController {
     }
 
     /**
-     * @description: 新增物料属性模板详情
-     * @author: fengyuan_yang
-     * @date: 2023/4/20 15:32
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 新增物料属性模板详情
      **/
     @PostMapping("/saveAttributeDetailed")
     public R saveAttributeDetailed(@RequestBody QcTemplateData data){
@@ -775,11 +559,7 @@ public class QcController {
     }
 
     /**
-     * @description: 物料属性导入
-     * @author: fengyuan_yang
-     * @date: 2023/4/23 11:33
-     * @param: [file]
-     * @return: com.xujie.sys.common.utils.R
+     * 物料属性导入
      **/
     @PostMapping("/uploadPartAttributeExcel")
     public R uploadPartAttributeExcel(@RequestParam(value = "file") MultipartFile file, @ModelAttribute GetParamInData data){
@@ -787,15 +567,10 @@ public class QcController {
         return R.ok();
     }
 
-
     // ======================= 分类属性设置API =======================
 
     /**
-     * @description: 查询类别属性
-     * @author: fengyuan_yang
-     * @date: 2023/4/21 9:08
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 查询类别属性
      **/
     @PostMapping(value="/qcFamilyAttributeSearch")
     public R qcFamilyAttributeSearch(@RequestBody QcPartAttributeData data){
@@ -804,11 +579,7 @@ public class QcController {
     }
 
     /**
-     * @description: 新增类别属性
-     * @author: fengyuan_yang
-     * @date: 2023/4/21 9:29
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 新增类别属性
      **/
     @PostMapping("/qcFamilyAttributeSave")
     public R qcFamilyAttributeSave(@RequestBody QcPartAttributeData data){
@@ -817,11 +588,7 @@ public class QcController {
     }
 
     /**
-     * @description: 删除类别属性
-     * @author: fengyuan_yang
-     * @date: 2023/4/21 9:56
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 删除类别属性
      **/
     @PostMapping("/qcFamilyAttributeDelete")
     public R qcFamilyAttributeDelete(@RequestBody QcPartAttributeData data){
@@ -830,11 +597,7 @@ public class QcController {
     }
 
     /**
-     * @description: 类别属性导入
-     * @author: fengyuan_yang
-     * @date: 2023/4/23 15:58
-     * @param: [file]
-     * @return: com.xujie.sys.common.utils.R
+     * 类别属性导入
      **/
     @PostMapping("/uploadFamilyAttributeExcel")
     public R uploadFamilyAttributeExcel(@RequestParam(value = "file") MultipartFile file, @ModelAttribute GetParamInData data){
@@ -845,11 +608,7 @@ public class QcController {
     // ======================= 抽样方案API =======================
 
     /**
-     * @description: 查询抽样方案
-     * @author: fengyuan_yang
-     * @date: 2023/4/21 13:32
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 查询抽样方案
      **/
     @PostMapping(value="/samplingProgrammeSearch")
     public R samplingProgrammeSearch(@RequestBody QcSamplingInspectionProgrammeData data){
@@ -858,11 +617,7 @@ public class QcController {
     }
 
     /**
-     * @description: 新增抽样方案
-     * @author: fengyuan_yang
-     * @date: 2023/4/21 13:47
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 新增抽样方案
      **/
     @PostMapping("/samplingProgrammeSave")
     public R samplingProgrammeSave(@RequestBody QcSamplingInspectionProgrammeData data){
@@ -871,11 +626,7 @@ public class QcController {
     }
 
     /**
-     * @description: 删除抽样方案
-     * @author: fengyuan_yang
-     * @date: 2023/4/23 8:58
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 删除抽样方案
      **/
     @PostMapping("/samplingProgrammeDelete")
     public R samplingProgrammeDelete(@RequestBody QcSamplingInspectionProgrammeData data){
@@ -884,11 +635,7 @@ public class QcController {
     }
 
     /**
-     * @description: 搜索抽样方案中的矩阵
-     * @author: fengyuan_yang
-     * @date: 2023/4/21 15:43
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 搜索抽样方案中的矩阵
      **/
     @PostMapping("/searchSamplingProgrammeDetails")
     public R searchSamplingProgrammeDetails(@RequestBody QcSamplingInspectionProgrammeData data){
@@ -897,11 +644,7 @@ public class QcController {
     }
 
     /**
-     * @description: 获取矩阵列表
-     * @author: fengyuan_yang
-     * @date: 2023/4/21 16:38
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 获取矩阵列表
      **/
     @PostMapping("/getPlanLists")
     public R getPlanLists(@RequestBody QcSamplingInspectionProgrammeData data){
@@ -913,11 +656,7 @@ public class QcController {
     }
 
     /**
-     * @description: 新增抽样方案中的矩阵
-     * @author: fengyuan_yang
-     * @date: 2023/4/21 17:41
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 新增抽样方案中的矩阵
      **/
     @PostMapping("/saveSamplingProgrammeDetails")
     public R saveSamplingProgrammeDetails(@RequestBody QcSamplingInspectionProgrammeData data){
@@ -926,11 +665,7 @@ public class QcController {
     }
 
     /**
-     * @description: 删除抽样方案中的矩阵
-     * @author: fengyuan_yang
-     * @date: 2023/4/21 17:52
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 删除抽样方案中的矩阵
      **/
     @PostMapping("/deleteSamplingProgrammeDetails")
     public R deleteSamplingProgrammeDetails(@RequestBody QcSamplingInspectionProgrammeData data){
@@ -941,11 +676,7 @@ public class QcController {
     // ======================= FAI检验API =======================
 
     /**
-     * @description: FAI记录查询
-     * @author: fengyuan_yang
-     * @date: 2023/4/24 10:10
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * FAI记录查询
      **/
     @PostMapping(value="/qcFAIInspectionSearch")
     public R qcFAIInspectionSearch(@RequestBody QcFAIRecordData data){
@@ -954,11 +685,7 @@ public class QcController {
     }
 
     /**
-     * @description: FAI明细记录查询
-     * @author: fengyuan_yang
-     * @date: 2023/4/25 9:16
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * FAI明细记录查询
      **/
     @PostMapping("/faiDetailSearch")
     public R faiDetailSearch(@RequestBody QcFAIRecordData data){
@@ -967,11 +694,7 @@ public class QcController {
     }
 
     /**
-     * @description: 保存FAI检验记录
-     * @author: fengyuan_yang
-     * @date: 2023/3/30 8:50
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 保存FAI检验记录
      **/
     @PostMapping("/saveFAIDetailedRecord")
     public R saveFAIDetailedRecord(@RequestBody QcFAIRecordData data){
@@ -980,11 +703,7 @@ public class QcController {
     }
 
     /**
-     * @description: 删除FAI检验记录
-     * @author: fengyuan_yang
-     * @date: 2023/3/30 9:03
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 删除FAI检验记录
      **/
     @PostMapping("/faiRecordDelete")
     public R faiRecordDelete(@RequestBody QcFAIRecordData data){
@@ -993,11 +712,7 @@ public class QcController {
     }
 
     /**
-     * @description: FAI审核
-     * @author: fengyuan_yang
-     * @date: 2023/3/31 17:17
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * FAI审核
      **/
     @PostMapping("/saveFAISubmitResult")
     public R saveFAISubmitResult(@RequestBody QcFAIRecordData data){
@@ -1006,11 +721,7 @@ public class QcController {
     }
 
     /**
-     * @description: 新增FAI子明细
-     * @author: fengyuan_yang
-     * @date: 2023/4/4 13:50
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 新增FAI子明细
      **/
     @PostMapping("/saveFAISubDetailed")
     public R saveFAISubDetailed(@RequestBody QcSubDetailInformationData data){
@@ -1019,11 +730,7 @@ public class QcController {
     }
 
     /**
-     * @description: 查询FAI子明细
-     * @author: fengyuan_yang
-     * @date: 2023/4/4 16:06
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 查询FAI子明细
      **/
     @PostMapping("/selectFAISubDetailedRecord")
     public R selectFAISubDetailedRecord(@RequestBody SubDetailValues data){
@@ -1032,11 +739,7 @@ public class QcController {
     }
 
     /**
-     * @description: 检查FAI是否已提交
-     * @author: fengyuan_yang
-     * @date: 2023/4/5 9:50
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 检查FAI是否已提交
      **/
     @PostMapping("/checkFAIIsSubmit")
     public R checkFAIIsSubmit(@RequestBody SubDetailValues data){
@@ -1045,11 +748,7 @@ public class QcController {
     }
 
     /**
-     * @description: 检查FAI子明细中的实测值是否在规定范围
-     * @author: fengyuan_yang
-     * @date: 2023/4/6 16:13
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 检查FAI子明细中的实测值是否在规定范围
      **/
     @PostMapping("/checkFAISubDetailValue")
     public R checkFAISubDetailValue(@RequestBody CheckSubDetailValueVo data){
@@ -1058,11 +757,7 @@ public class QcController {
     }
 
     /**
-     * @description: 新增FAI检验
-     * @author: fengyuan_yang
-     * @date: 2023/9/18 10:03
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 新增FAI检验
      **/
     @PostMapping("/saveFAIInspection")
     public R saveFAIInspection(@RequestBody QcFAIRecordData data){
@@ -1073,11 +768,7 @@ public class QcController {
     // ======================= FQC检验API =======================
 
     /**
-     * @description: FQC记录查询
-     * @author: fengyuan_yang
-     * @date: 2023/9/18 11:32
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * FQC记录查询
      **/
     @PostMapping(value="/qcFQCInspectionSearch")
     public R qcFQCInspectionSearch(@RequestBody QcFAIRecordData data){
@@ -1086,11 +777,7 @@ public class QcController {
     }
 
     /**
-     * @description: FQC记录新增
-     * @author: fengyuan_yang
-     * @date: 2023/9/18 11:34
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * FQC记录新增
      **/
     @PostMapping("/saveFQCInspection")
     public R saveFQCInspection(@RequestBody QcFAIRecordData data){
@@ -1099,11 +786,7 @@ public class QcController {
     }
 
     /**
-     * @description: FQC明细记录查询
-     * @author: fengyuan_yang
-     * @date: 2023/9/18 13:04
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * FQC明细记录查询
      **/
     @PostMapping("/fqcDetailSearch")
     public R fqcDetailSearch(@RequestBody QcFAIRecordData data){
@@ -1112,11 +795,7 @@ public class QcController {
     }
 
     /**
-     * @description: 删除FQC检验记录
-     * @author: fengyuan_yang
-     * @date: 2023/9/18 13:07
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 删除FQC检验记录
      **/
     @PostMapping("/fqcRecordDelete")
     public R fqcRecordDelete(@RequestBody QcFAIRecordData data){
@@ -1125,11 +804,7 @@ public class QcController {
     }
 
     /**
-     * @description: 保存FQC检验记录
-     * @author: fengyuan_yang
-     * @date: 2023/9/18 13:12
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 保存FQC检验记录
      **/
     @PostMapping("/saveFQCDetailedRecord")
     public R saveFQCDetailedRecord(@RequestBody QcFAIRecordData data){
@@ -1138,11 +813,7 @@ public class QcController {
     }
 
     /**
-     * @description: FQC审核
-     * @author: fengyuan_yang
-     * @date: 2023/9/18 13:20
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * FQC审核
      **/
     @PostMapping("/saveFQCSubmitResult")
     public R saveFQCSubmitResult(@RequestBody QcFAIRecordData data){
@@ -1151,11 +822,7 @@ public class QcController {
     }
 
     /**
-     * @description: 新增FQC子明细
-     * @author: fengyuan_yang
-     * @date: 2023/9/18 13:24
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 新增FQC子明细
      **/
     @PostMapping("/saveFQCSubDetailed")
     public R saveFQCSubDetailed(@RequestBody QcSubDetailInformationData data){
@@ -1164,11 +831,7 @@ public class QcController {
     }
 
     /**
-     * @description: 查询FQC子明细
-     * @author: fengyuan_yang
-     * @date: 2023/9/18 13:28
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 查询FQC子明细
      **/
     @PostMapping("/selectFQCSubDetailedRecord")
     public R selectFQCSubDetailedRecord(@RequestBody SubDetailValues data){
@@ -1177,11 +840,7 @@ public class QcController {
     }
 
     /**
-     * @description: 检查是否已提交
-     * @author: fengyuan_yang
-     * @date: 2023/9/18 13:31
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 检查是否已提交
      **/
     @PostMapping("/checkFQCIsSubmit")
     public R checkFQCIsSubmit(@RequestBody SubDetailValues data){
@@ -1190,11 +849,7 @@ public class QcController {
     }
 
     /**
-     * @description: 检查FQC子明细中的实测值是否在规定范围
-     * @author: fengyuan_yang
-     * @date: 2023/9/18 13:35
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 检查FQC子明细中的实测值是否在规定范围
      **/
     @PostMapping("/checkFQCSubDetailValue")
     public R checkFQCSubDetailValue(@RequestBody CheckSubDetailValueVo data){
@@ -1205,11 +860,7 @@ public class QcController {
     // ======================= IPQC检验API =======================
 
     /**
-     * @description: IPQC记录查询
-     * @author: fengyuan_yang
-     * @date: 2023/4/24 10:10
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * IPQC记录查询
      **/
     @PostMapping(value="/qcIPQCInspectionSearch")
     public R qcIPQCInspectionSearch(@RequestBody QcFAIRecordData data){
@@ -1218,11 +869,7 @@ public class QcController {
     }
 
     /**
-     * @description: IPQC明细记录查询
-     * @author: fengyuan_yang
-     * @date: 2023/4/25 9:16
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * IPQC明细记录查询
      **/
     @PostMapping("/ipqcDetailSearch")
     public R ipqcDetailSearch(@RequestBody QcFAIRecordData data){
@@ -1231,11 +878,7 @@ public class QcController {
     }
 
     /**
-     * @description: 删除IPQC检验记录
-     * @author: fengyuan_yang
-     * @date: 2023/3/30 9:03
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 删除IPQC检验记录
      **/
     @PostMapping("/ipqcRecordDelete")
     public R ipqcRecordDelete(@RequestBody QcFAIRecordData data){
@@ -1244,11 +887,7 @@ public class QcController {
     }
 
     /**
-     * @description: 保存IPQC检验记录
-     * @author: fengyuan_yang
-     * @date: 2023/4/26 17:26
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 保存IPQC检验记录
      **/
     @PostMapping("/saveIPQCDetailedRecord")
     public R saveIPQCDetailedRecord(@RequestBody QcFAIRecordData data){
@@ -1257,11 +896,7 @@ public class QcController {
     }
 
     /**
-     * @description: IPQC审核
-     * @author: fengyuan_yang
-     * @date: 2023/4/26 17:36
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * IPQC审核
      **/
     @PostMapping("/saveIPQCSubmitResult")
     public R saveIPQCSubmitResult(@RequestBody QcFAIRecordData data){
@@ -1270,11 +905,7 @@ public class QcController {
     }
 
     /**
-     * @description: 新增IPQC子明细信息
-     * @author: fengyuan_yang
-     * @date: 2023/4/26 17:46
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 新增IPQC子明细信息
      **/
     @PostMapping("/saveIPQCSubDetailed")
     public R saveIPQCSubDetailed(@RequestBody QcSubDetailInformationData data){
@@ -1283,11 +914,7 @@ public class QcController {
     }
 
     /**
-     * @description: 查询IPQC子明细
-     * @author: fengyuan_yang
-     * @date: 2023/4/26 17:56
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.R
+     * 查询IPQC子明细
      **/
     @PostMapping("/selectIPQCSubDetailedRecord")
     public R selectIPQCSubDetailedRecord(@RequestBody SubDetailValues data){
@@ -2038,6 +1665,24 @@ public class QcController {
         return R.ok().put("rows", list);
     }
 
+    /**
+     * 新增巡检记录
+     **/
+    @PostMapping("/batchSaveOsInspection")
+    public R batchSaveOsInspection(@RequestBody QcFAIRecordData data){
+        qcService.batchSaveOsInspection(data);
+        return R.ok();
+    }
+
+    /**
+     * IPQC任务重载
+     */
+    @PostMapping("/ipqcRecordOverLoad")
+    public R ipqcRecordOverLoad(@RequestBody QcFAIRecordData data){
+        qcService.ipqcRecordOverLoad(data);
+        return R.ok();
+    }
+
 }
 
 
diff --git a/src/main/java/com/xujie/sys/modules/pms/data/QcDetailInformationData.java b/src/main/java/com/xujie/sys/modules/pms/data/QcDetailInformationData.java
index 0d50af2..0373db0 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/QcDetailInformationData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/QcDetailInformationData.java
@@ -1,163 +1,34 @@
 package com.xujie.sys.modules.pms.data;
 
+import lombok.Data;
+
 import java.math.BigDecimal;
 
-/**
- * @description: 明细记录实体类
- * @author: fengyuan_yang
- * @date: 2023/3/29 16:07
- * @param:
- * @return:
- **/
+@Data
 public class QcDetailInformationData {
-    // 主键
+    /**
+     * ID
+     */
     private Integer id;
-    // 检验编码
+    /**
+     * Site
+     */
+    private String site;
+    /**
+     * BU
+     */
+    private String buNo;
+    /**
+     * 检验编码
+     */
     private String inspectionNo;
-    // 项目编码
-    private String itemNo;
-    // 项目名称
-    private String itemDesc;
-    // 检验类型
-    private String valueTypeDb;
-    // 检验类型
-    private String valueType;
-    // 数字实测值
-    private BigDecimal numberValue;
-    // 是否合格
-    private String isQualified;
-    // 项目默认值
-    private String defaultValue;
-    // 项目最大值
-    private BigDecimal maxValue;
-    // 项目最小值
-    private BigDecimal minValue;
-    // 文本实测值
-    private String textValue;
-    // 检验方法名称
-    private String methodName;
-    // 检验方法描述
-    private String methodRemark;
-    // 提交标识
-    private String isSubmit;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getInspectionNo() {
-        return inspectionNo;
-    }
-
-    public void setInspectionNo(String inspectionNo) {
-        this.inspectionNo = inspectionNo;
-    }
-
-    public String getItemNo() {
-        return itemNo;
-    }
-
-    public void setItemNo(String itemNo) {
-        this.itemNo = itemNo;
-    }
-
-    public String getItemDesc() {
-        return itemDesc;
-    }
-
-    public void setItemDesc(String itemDesc) {
-        this.itemDesc = itemDesc;
-    }
-
-    public String getValueTypeDb() {
-        return valueTypeDb;
-    }
-
-    public void setValueTypeDb(String valueTypeDb) {
-        this.valueTypeDb = valueTypeDb;
-    }
-
-    public String getIsQualified() {
-        return isQualified;
-    }
-
-    public void setIsQualified(String isQualified) {
-        this.isQualified = isQualified;
-    }
-
-    public String getValueType() {
-        return valueType;
-    }
-
-    public void setValueType(String valueType) {
-        this.valueType = valueType;
-    }
 
-    public String getDefaultValue() {
-        return defaultValue;
-    }
-
-    public void setDefaultValue(String defaultValue) {
-        this.defaultValue = defaultValue;
-    }
-
-    public BigDecimal getNumberValue() {
-        return numberValue;
-    }
-
-    public void setNumberValue(BigDecimal numberValue) {
-        this.numberValue = numberValue;
-    }
-
-    public BigDecimal getMaxValue() {
-        return maxValue;
-    }
-
-    public void setMaxValue(BigDecimal maxValue) {
-        this.maxValue = maxValue;
-    }
-
-    public BigDecimal getMinValue() {
-        return minValue;
-    }
-
-    public void setMinValue(BigDecimal minValue) {
-        this.minValue = minValue;
-    }
-
-    public String getTextValue() {
-        return textValue;
-    }
-
-    public void setTextValue(String textValue) {
-        this.textValue = textValue;
-    }
-
-    public String getMethodName() {
-        return methodName;
-    }
-
-    public void setMethodName(String methodName) {
-        this.methodName = methodName;
-    }
-
-    public String getMethodRemark() {
-        return methodRemark;
-    }
-
-    public void setMethodRemark(String methodRemark) {
-        this.methodRemark = methodRemark;
-    }
-
-    public String getIsSubmit() {
-        return isSubmit;
-    }
-
-    public void setIsSubmit(String isSubmit) {
-        this.isSubmit = isSubmit;
-    }
+    /**
+     * 模板编码
+     */
+    private String templateId;
+    /**
+     * 项目编码
+     */
+    private String itemNo;
 }
diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java
index 46b722c..dedfc74 100644
--- a/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java
+++ b/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java
@@ -597,4 +597,10 @@ public interface QcMapper {
     List<QcRecordData> selectIPQCRecordByType(QcFAIRecordData qcData);
 
     void updateSOScheduledRoutingTypeFlag2(@Param("site") String site, @Param("seqNo") String seqNo, @Param("inspectionTypeNo") String inspectionTypeNo);
+
+    void saveIPQCDetailedRecords(List<QcFAIRecordData> saveItemList);
+
+    List<QcDetailInformationData> getIPQCDetailInfo(@Param("site") String site, @Param("buNo") String buNo, @Param("inspectionNo") String inspectionNo);
+
+    void updateIPQCRecord(QcFAIRecordData recordData);
 }
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
index 908f7fd..f0897bd 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
@@ -57,11 +57,6 @@ import java.util.stream.Collectors;
 
 import static org.apache.coyote.http11.Constants.a;
 
-/**
- * @description: 质量管理业务层
- * @author: fengyuan_yang
- * @date: 2023/3/20 17:06
- **/
 @Service
 @Slf4j
 public class QcServiceImpl implements QcService {
@@ -93,11 +88,7 @@ public class QcServiceImpl implements QcService {
     // ======================= 检验方法 =======================
 
     /**
-     * @description: 条件查询检验方法
-     * @author: fengyuan_yang
-     * @date: 2023/3/24 11:33
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcMethodData>
+     * 条件查询检验方法
      **/
     @Override
     public PageUtils qcMethodSearch(QcMethodData data) {
@@ -106,11 +97,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 新增检验方法
-     * @author: fengyuan_yang
-     * @date: 2023/3/24 11:33
-     * @param: [data]
-     * @return: com.xujie.sys.modules.pms.util.ResponseData
+     * 新增检验方法
      **/
     @Override
     public void qcMethodSave(QcMethodData data) {
@@ -145,11 +132,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 修改检验方法
-     * @author: fengyuan_yang
-     * @date: 2023/3/24 11:33
-     * @param: [data]
-     * @return: com.xujie.sys.modules.pms.util.ResponseData
+     * 修改检验方法
      **/
     @Override
     public void qcMethodUpdate(QcMethodData data) {
@@ -169,11 +152,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 删除检验方法
-     * @author: fengyuan_yang
-     * @date: 2023/3/24 11:33
-     * @param: [data]
-     * @return: com.xujie.sys.modules.pms.util.ResponseData
+     * 删除检验方法
      **/
     @Override
     public void qcMethodDelete(QcMethodData data) {
@@ -189,11 +168,7 @@ public class QcServiceImpl implements QcService {
     // ======================= 检验项目 =======================
 
     /**
-     * @description: 根据条件查询检验项目
-     * @author: fengyuan_yang
-     * @date: 2023/3/20 17:07
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcItemData>
+     * 根据条件查询检验项目
      **/
     @Override
     public PageUtils qcItemSearch(QcItemData data) {
@@ -202,11 +177,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 新增检验项目
-     * @author: fengyuan_yang
-     * @date: 2023/3/20 21:46
-     * @param: [data]
-     * @return: com.xujie.sys.modules.pms.util.ResponseData
+     * 新增检验项目
      **/
     @Override
     @Transactional
@@ -218,22 +189,6 @@ public class QcServiceImpl implements QcService {
         } else {
             throw new RuntimeException("工厂和部门有误!");
         }
-//        // 获取编码
-//        String itemNo = qcMapper.getItemNo(data);
-//        if ("101".equals(data.getInspectionTypeNo()) || "102".equals(data.getInspectionTypeNo()) || "103".equals(data.getInspectionTypeNo()) || "104".equals(data.getInspectionTypeNo())) {
-//            data.setItemNo("IPQC-" + itemNo);
-//        } else if ("105".equals(data.getInspectionTypeNo())) {
-//            data.setItemNo("IQC-" + itemNo);
-//        } else if ("106".equals(data.getInspectionTypeNo())) {
-//            data.setItemNo("FAI-" + itemNo);
-//        } else if ("107".equals(data.getInspectionTypeNo())) {
-//            data.setItemNo("FQC-" + itemNo);
-//        } else if ("108".equals(data.getInspectionTypeNo())) {
-//            data.setItemNo("FQAS-" + itemNo);
-//        } else if ("109".equals(data.getInspectionTypeNo())) {
-//            data.setItemNo("OQC-" + itemNo);
-//        }
-
         List<QcItemData> checkItemOnlyOne = qcMapper.checkItemOnlyOne(data);
         if (!checkItemOnlyOne.isEmpty()) {
             throw new RuntimeException("该检验项目已存在!");
@@ -257,11 +212,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 修改检验项目
-     * @author: fengyuan_yang
-     * @date: 2023/3/20 22:27
-     * @param: [data]
-     * @return: com.xujie.sys.modules.pms.util.ResponseData
+     * 修改检验项目
      **/
     @Override
     @Transactional
@@ -296,11 +247,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 删除检验项目
-     * @author: fengyuan_yang
-     * @date: 2023/3/20 23:12
-     * @param: [data]
-     * @return: com.xujie.sys.modules.pms.util.ResponseData
+     * 删除检验项目
      **/
     @Override
     @Transactional
@@ -316,95 +263,8 @@ public class QcServiceImpl implements QcService {
         qcMapper.qcItemMethodDelete(data);
     }
 
-//    /**
-//     * @description: 检验项目导入
-//     * @author: fengyuan_yang
-//     * @date: 2023/4/15 12:58
-//     * @param: [file]
-//     * @return: void
-//     **/
-//    @Override
-//    @Transactional
-//    public void taskUploadExcel(MultipartFile file, GetParamInData data) {
-//        try{
-//            // 转流
-//            InputStream is = file.getInputStream();
-//            // 读取工作簿
-//            XSSFWorkbook workbook = new XSSFWorkbook(is);
-//            // 读取工作表
-//            XSSFSheet sheet = workbook.getSheetAt(0);
-//            // 获取行数
-//            int rows = sheet.getPhysicalNumberOfRows();
-//            // 声明对象
-//            QcItemData task;
-//            // 遍历每一行（从第二行开始）
-//            for (int j = 1; j < rows; j++) {
-//                // 实例化对象
-//                task = new QcItemData();
-//                //获得该行
-//                XSSFRow row = sheet.getRow(j);
-//                // 为对象赋值
-//                task.setSite(row.getCell(0).getStringCellValue()); // site
-//                task.setBuNo(row.getCell(1).getStringCellValue()); // bu
-//                task.setItemDesc(row.getCell(2).getStringCellValue()); // 检验项目名称
-//                task.setInspectionTypeNo(row.getCell(3).getRawValue()); // 检验类型
-//                // 获取编码
-//                String itemNo = qcMapper.getItemNo(task);
-//                if ("101".equals(task.getInspectionTypeNo()) || "102".equals(task.getInspectionTypeNo()) || "103".equals(task.getInspectionTypeNo()) || "104".equals(task.getInspectionTypeNo())) {
-//                    task.setItemNo("IPQC-" + itemNo);
-//                } else if ("105".equals(task.getInspectionTypeNo())) {
-//                    task.setItemNo("IQC-" + itemNo);
-//                } else if ("106".equals(task.getInspectionTypeNo())) {
-//                    task.setItemNo("FAI-" + itemNo);
-//                } else if ("107".equals(task.getInspectionTypeNo())) {
-//                    task.setItemNo("FQC-" + itemNo);
-//                } else if ("108".equals(task.getInspectionTypeNo())) {
-//                    task.setItemNo("FQAS-" + itemNo);
-//                }
-//                task.setValueType(row.getCell(4).getStringCellValue()); // 检验值类型
-//                if (row.getCell(4).getStringCellValue().equals("文本")) { // 检验值类型DB
-//                    task.setValueTypeDb("T");
-//                    task.setMaxValue(null);
-//                    task.setMinValue(null);
-//                } else if (row.getCell(4).getStringCellValue().equals("数字")) {
-//                    task.setValueTypeDb("N");
-//                    if (row.getCell(6) == null) { // 上限值
-//                        task.setMaxValue(null);
-//                    } else {
-//                        task.setMaxValue(BigDecimal.valueOf(row.getCell(6).getNumericCellValue()));
-//                    }
-//                    if (row.getCell(7) == null) { // 下限值
-//                        task.setMinValue(null);
-//                    } else {
-//                        task.setMinValue(BigDecimal.valueOf(row.getCell(7).getNumericCellValue()));
-//                    }
-//                } else {
-//                    task.setValueTypeDb(null);
-//                }
-//                if (row.getCell(5) == null) { // 标准值
-//                    task.setDefaultValue(null);
-//                } else {
-//                    task.setDefaultValue(row.getCell(2).getRawValue());
-//                }
-//                task.setItemType("D");
-//                task.setCreatedBy(data.getCreateBy());
-//                task.setMethodNo(row.getCell(8).getRawValue()); // 检验方法编码
-//                // 新增
-//                qcMapper.qcItemSave(task);
-//                // 新增项目里的方法
-//                qcMapper.qcItemMethodSave(task);
-//            }
-//        } catch (Exception e) {
-//            throw new RuntimeException("导入失败："+e.getMessage());
-//        }
-//    }
-
     /**
-     * @description: 检验项目导入
-     * @author: fengyuan_yang
-     * @date: 2023/4/15 12:58
-     * @param: [file]
-     * @return: void
+     * 检验项目导入
      **/
     @Override
     @Transactional
@@ -636,11 +496,7 @@ public class QcServiceImpl implements QcService {
     // ======================= 质检员信息维护 =======================
 
     /**
-     * @description: 查询质检员信息列表
-     * @author: fengyuan_yang
-     * @date: 2023/3/31 10:47
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcInspectorData>
+     * 查询质检员信息列表
      **/
     @Override
     public List<QcInspectorData> inspectorSearch() {
@@ -649,11 +505,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 新增质检员信息
-     * @author: fengyuan_yang
-     * @date: 2023/3/31 10:47
-     * @param: [data]
-     * @return: com.xujie.sys.modules.pms.util.ResponseData
+     * 新增质检员信息
      **/
     @Override
     public ResponseData inspectorSave(QcInspectorData data) {
@@ -672,11 +524,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 修改质检员信息
-     * @author: fengyuan_yang
-     * @date: 2023/3/31 10:48
-     * @param: [data]
-     * @return: com.xujie.sys.modules.pms.util.ResponseData
+     * 修改质检员信息
      **/
     @Override
     public ResponseData inspectorUpdate(QcInspectorData data) {
@@ -690,11 +538,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 删除质检员信息
-     * @author: fengyuan_yang
-     * @date: 2023/3/31 10:48
-     * @param: [data]
-     * @return: com.xujie.sys.modules.pms.util.ResponseData
+     * 删除质检员信息
      **/
     @Override
     public ResponseData inspectorDelete(QcInspectorData data) {
@@ -710,11 +554,7 @@ public class QcServiceImpl implements QcService {
     // ======================= 抽样方案维护 =======================
 
     /**
-     * @description: 查询抽检方案
-     * @author: fengyuan_yang
-     * @date: 2023/4/7 16:16
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.PageUtils
+     * 查询抽检方案
      **/
     @Override
     public PageUtils samplingInspectionPlanSearch(QcSamplingInspectionPlanData data) {
@@ -723,11 +563,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 新增抽样方案
-     * @author: fengyuan_yang
-     * @date: 2023/4/10 9:49
-     * @param: [data]
-     * @return: void
+     * 新增抽样方案
      **/
     @Override
     public void samplingInspectionPlanSave(QcSamplingInspectionPlanData data) {
@@ -738,15 +574,6 @@ public class QcServiceImpl implements QcService {
         } else {
             throw new RuntimeException("工厂和部门有误!");
         }
-        // 根据三个编码查方案
-//        QcSamplingInspectionPlanData samplingPlanData = qcMapper.selectSamplingPlanByNo(data);
-//        QcSamplingInspectionPlanData samplingPlanData2 = qcMapper.selectSamplingPlanByDesc(data);
-//        if (samplingPlanData != null) {
-//            throw new RuntimeException("该矩阵内容已存在!");
-//        }
-//        if (samplingPlanData2 != null) {
-//            throw new RuntimeException("该矩阵名称已存在!");
-//        }
         // 查询最大编码，自增后赋值
         String s = qcMapper.queryLastSamplingPlanNo(data);
         if (s == null) {
@@ -759,11 +586,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 修改抽样方案
-     * @author: fengyuan_yang
-     * @date: 2023/4/10 12:59
-     * @param: [data]
-     * @return: void
+     * 修改抽样方案
      **/
     @Override
     public void samplingInspectionPlanUpdate(QcSamplingInspectionPlanData data) {
@@ -783,11 +606,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 删除抽样方案
-     * @author: fengyuan_yang
-     * @date: 2023/4/10 13:03
-     * @param: [data]
-     * @return: void
+     * 删除抽样方案
      **/
     @Override
     public void samplingInspectionPlanDelete(QcSamplingInspectionPlanData data) {
@@ -797,11 +616,7 @@ public class QcServiceImpl implements QcService {
     // ======================= 检验模板维护 =======================
 
     /**
-     * @description: 查询模板
-     * @author: fengyuan_yang
-     * @date: 2023/4/10 15:56
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.PageUtils
+     * 查询模板
      **/
     @Override
     public PageUtils templateSearch(QcTemplateData data) {
@@ -810,11 +625,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 新增模板
-     * @author: fengyuan_yang
-     * @date: 2023/4/10 17:18
-     * @param: [data]
-     * @return: void
+     * 新增模板
      **/
     @Override
     public void templateSave(QcTemplateData data) {
@@ -849,11 +660,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 修改模板
-     * @author: fengyuan_yang
-     * @date: 2023/4/10 17:38
-     * @param: [data]
-     * @return: void
+     * 修改模板
      **/
     @Override
     public void templateUpdate(QcTemplateData data) {
@@ -872,11 +679,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 模板中的项目清单
-     * @author: fengyuan_yang
-     * @date: 2023/4/11 9:41
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcTemplateData>
+     * 模板中的项目清单
      **/
     @Override
     public List<QcTemplateData> templateDetailsSearch(QcTemplateData data) {
@@ -885,11 +688,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 新增项目的检验明细
-     * @author: fengyuan_yang
-     * @date: 2023/4/11 10:11
-     * @param: [data]
-     * @return: void
+     * 新增项目的检验明细
      **/
     @Override
     public void addItemDetails(QcTemplateData data) {
@@ -912,11 +711,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 删除项目的检验明细
-     * @author: fengyuan_yang
-     * @date: 2023/4/11 10:59
-     * @param: [inData]
-     * @return: void
+     * 删除项目的检验明细
      **/
     @Override
     @Transactional
@@ -933,11 +728,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 获取当前项目不包含的明细
-     * @author: fengyuan_yang
-     * @date: 2023/4/12 13:57
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcTemplateData>
+     * 获取当前项目不包含的明细
      **/
     @Override
     public List<QcTemplateData> getItemList(QcTemplateData data) {
@@ -946,11 +737,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 查询项目
-     * @author: fengyuan_yang
-     * @date: 2023/11/19 13:04
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcTemplateData>
+     * 查询项目
      **/
     @Override
     public List<QcTemplateData> getItem(QcTemplateData data) {
@@ -960,8 +747,6 @@ public class QcServiceImpl implements QcService {
 
     /**
      * 获取检验方法列表
-     * @param data
-     * @return
      */
     @Override
     public List<QcMethodData> queryMethodList(QcMethodData data) {
@@ -977,11 +762,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 删除项目
-     * @author: fengyuan_yang
-     * @date: 2023/4/12 15:26
-     * @param: [data]
-     * @return: void
+     * 删除项目
      **/
     @Override
     @Transactional
@@ -993,11 +774,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 新增项目明细的自定义最大最小值
-     * @author: fengyuan_yang
-     * @date: 2023/4/16 17:26
-     * @param: [data]
-     * @return: void
+     * 新增项目明细的自定义最大最小值
      **/
     @Override
     @Transactional
@@ -1011,11 +788,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 检验模板导入
-     * @author: fengyuan_yang
-     * @date:  16:32
-     * @param: [file]
-     * @return: void
+     * 检验模板导入
      **/
     @Override
     @Transactional
@@ -1202,11 +975,7 @@ public class QcServiceImpl implements QcService {
     // ======================= 样本量维护 =======================
 
     /**
-     * @description: 查询样本量
-     * @author: fengyuan_yang
-     * @date: 2023/4/17 10:50
-     * @param: [data]
-     * @return: void
+     * 查询样本量
      **/
     @Override
     public PageUtils samplingQtySearch(QcSamplingInspectionQtyData data) {
@@ -1215,11 +984,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 新增样本量
-     * @author: fengyuan_yang
-     * @date: 2023/4/17 11:25
-     * @param: [data]
-     * @return: void
+     * 新增样本量
      **/
     @Override
     public void samplingQtySave(QcSamplingInspectionQtyData data) {
@@ -1248,11 +1013,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 修改样本量
-     * @author: fengyuan_yang
-     * @date: 2023/4/17 13:01
-     * @param: [data]
-     * @return: void
+     * 修改样本量
      **/
     @Override
     public void samplingQtyUpdate(QcSamplingInspectionQtyData data) {
@@ -1274,11 +1035,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 删除样本量
-     * @author: fengyuan_yang
-     * @date: 2023/4/17 13:22
-     * @param: [data]
-     * @return: void
+     * 删除样本量
      **/
     @Override
     public void samplingQtyDelete(QcSamplingInspectionQtyData data) {
@@ -1294,11 +1051,7 @@ public class QcServiceImpl implements QcService {
     // ======================= 批量级次维护 =======================
 
     /**
-     * @description: 查询批量级次
-     * @author: fengyuan_yang
-     * @date: 2023/4/17 13:40
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcSamplingInspectionQtyRankData>
+     * 查询批量级次
      **/
     @Override
     public PageUtils samplingQtyRankSearch(QcSamplingInspectionQtyRankData data) {
@@ -1307,11 +1060,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 新增批量级次
-     * @author: fengyuan_yang
-     * @date: 2023/4/17 14:01
-     * @param: [data]
-     * @return: void
+     * 新增批量级次
      **/
     @Override
     public void samplingQtyRankSave(QcSamplingInspectionQtyRankData data) {
@@ -1340,11 +1089,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 修改批量级次
-     * @author: fengyuan_yang
-     * @date: 2023/4/17 14:06
-     * @param: [data]
-     * @return: void
+     * 修改批量级次
      **/
     @Override
     public void samplingQtyRankUpdate(QcSamplingInspectionQtyRankData data) {
@@ -1366,11 +1111,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 删除批量级次
-     * @author: fengyuan_yang
-     * @date: 2023/4/17 14:06
-     * @param: [data]
-     * @return: void
+     * 删除批量级次
      **/
     @Override
     public void samplingQtyRankDelete(QcSamplingInspectionQtyRankData data) {
@@ -1385,11 +1126,7 @@ public class QcServiceImpl implements QcService {
     // ======================= 检验等级维护 =======================
 
     /**
-     * @description: 查询检验等级
-     * @author: fengyuan_yang
-     * @date: 2023/4/17 15:05
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcSamplingInspectionLevelData>
+     * 查询检验等级
      **/
     @Override
     public PageUtils samplingLevelSearch(QcSamplingInspectionLevelData data) {
@@ -1398,11 +1135,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 新增检验等级
-     * @author: fengyuan_yang
-     * @date: 2023/4/17 15:07
-     * @param: [data]
-     * @return: void
+     * 新增检验等级
      **/
     @Override
     public void samplingLevelSave(QcSamplingInspectionLevelData data) {
@@ -1431,11 +1164,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 修改检验等级
-     * @author: fengyuan_yang
-     * @date: 2023/4/17 15:07
-     * @param: [data]
-     * @return: void
+     * 修改检验等级
      **/
     @Override
     public void samplingLevelUpdate(QcSamplingInspectionLevelData data) {
@@ -1457,11 +1186,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 删除检验等级
-     * @author: fengyuan_yang
-     * @date: 2023/4/17 15:07
-     * @param: [data]
-     * @return: void
+     * 删除检验等级
      **/
     @Override
     public void samplingLevelDelete(QcSamplingInspectionLevelData data) {
@@ -1474,11 +1199,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 搜索所有检验类型
-     * @author: fengyuan_yang
-     * @date: 2023/4/18 17:17
-     * @param: []
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcInspectionTypeData>
+     * 搜索所有检验类型
      **/
     @Override
     public List<QcInspectionTypeData> inspectionTypeSearch(QcInspectionTypeData data) {
@@ -1487,11 +1208,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 搜索所有设备
-     * @author: fengyuan_yang
-     * @date: 2023/4/19 14:41
-     * @param: []
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.EamObjectData>
+     * 搜索所有设备
      **/
     @Override
     public List<EamObjectData> objectSearch(EamObjectData inData) {
@@ -1505,11 +1222,7 @@ public class QcServiceImpl implements QcService {
     // ======================= 物料属性设置维护 =======================
 
     /**
-     * @description: 查询物料属性
-     * @author: fengyuan_yang
-     * @date: 2023/4/19 11:43
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.PageUtils
+     * 查询物料属性
      **/
     @Override
     public PageUtils qcPartAttributeSearch(QcPartAttributeData data) {
@@ -1518,11 +1231,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 新增物料属性
-     * @author: fengyuan_yang
-     * @date: 2023/4/19 17:14
-     * @param: [data]
-     * @return: void
+     * 新增物料属性
      **/
     @Override
     public void qcPartAttributeSave(QcPartAttributeData data) {
@@ -1544,11 +1253,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 物料属性修改
-     * @author: fengyuan_yang
-     * @date: 2023/10/27 13:26
-     * @param: [data]
-     * @return: void
+     * 物料属性修改
      **/
     @Override
     public void qcPartAttributeEdit(QcPartAttributeData data) {
@@ -1568,11 +1273,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 删除物料属性
-     * @author: fengyuan_yang
-     * @date: 2023/4/20 16:45
-     * @param: [data]
-     * @return: void
+     * 删除物料属性
      **/
     @Override
     @Transactional
@@ -1586,11 +1287,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 查询物料模板
-     * @author: fengyuan_yang
-     * @date: 2023/4/19 17:50
-     * @param: [data]
-     * @return: void
+     * 查询物料模板
      **/
     @Override
     public List<QcTemplateData> searchPartAttributeDetails(QcTemplateData data) {
@@ -1599,11 +1296,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 新增物料属性模板
-     * @author: fengyuan_yang
-     * @date: 2023/4/20 9:35
-     * @param: [data]
-     * @return: void
+     * 新增物料属性模板
      **/
     @Override
     @Transactional
@@ -1670,11 +1363,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 可选模板
-     * @author: fengyuan_yang
-     * @date: 2023/4/20 11:21
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcTemplateData>
+     * 可选模板
      **/
     @Override
     public List<QcTemplateData> getTemplateList(QcTemplateData data) {
@@ -1683,11 +1372,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 已有模板
-     * @author: fengyuan_yang
-     * @date: 2023/4/20 11:21
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcTemplateData>
+     * 已有模板
      **/
     @Override
     public List<QcTemplateData> getPartTemplateList(QcTemplateData data) {
@@ -1696,11 +1381,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 物料可选模板
-     * @author: fengyuan_yang
-     * @date: 2023/4/20 11:21
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcTemplateData>
+     * 物料可选模板
      **/
     @Override
     public List<QcTemplateData> getTemplateListAll(QcTemplateData data) {
@@ -1709,11 +1390,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 删除物料属性模板
-     * @author: fengyuan_yang
-     * @date: 2023/4/20 13:11
-     * @param: [data]
-     * @return: void
+     * 删除物料属性模板
      **/
     @Override
     @Transactional
@@ -1732,11 +1409,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 新增物料属性模板详情
-     * @author: fengyuan_yang
-     * @date: 2023/4/20 15:32
-     * @param: [data]
-     * @return: void
+     * 新增物料属性模板详情
      **/
     @Override
     @Transactional
@@ -1747,11 +1420,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 物料属性导入
-     * @author: fengyuan_yang
-     * @date: 2023/4/23 11:37
-     * @param: [file]
-     * @return: void
+     * 物料属性导入
      **/
     @Override
     @Transactional
@@ -1807,72 +1476,13 @@ public class QcServiceImpl implements QcService {
         } catch (DataAccessException e) {
             throw new RuntimeException("Database access failed.", e);
         }
-
-//        try{
-//            // 转流
-//            InputStream is = file.getInputStream();
-//            // 读取工作簿
-//            XSSFWorkbook workbook = new XSSFWorkbook(is);
-//            // 读取工作表
-//            XSSFSheet sheet = workbook.getSheetAt(0);
-//            // 获取行数
-//            int rows = sheet.getPhysicalNumberOfRows();
-//            // 声明对象
-//            QcPartAttributeData task = null;
-//            // 遍历每一行（从第二行开始）
-//            for (int j = 1; j < rows; j++) {
-//                // 实例化对象
-//                task = new QcPartAttributeData();
-//                // 获得该行
-//                XSSFRow row = sheet.getRow(j);
-//                // 为对象赋值
-//                task.setSite(paramData.getSite());
-//                task.setPartNo(row.getCell(0).getRawValue());
-//                task.setSupplierNo(row.getCell(1).getRawValue());
-//                task.setAttributeType("A");
-//                task.setAttributeRemark(row.getCell(2).getStringCellValue());
-//                task.setCreateBy(paramData.getCreateBy());
-//                // 查重
-//                task.setAttributeNo(task.getPartNo());
-//                QcPartAttributeData partAttributeData = qcMapper.selectPartAttributeByNo(task);
-//                if(partAttributeData != null){
-//                    throw new RuntimeException("该物料属性已存在!");
-//                }
-//                // 新增物料属性
-//                qcMapper.qcPartAttributeSave(task);
-//                QcTemplateData templateData = new QcTemplateData();
-//                templateData.setSite(task.getSite());
-//                templateData.setAttributeNo(task.getPartNo());
-//                // 新增物料属性中的模板
-//                int cells = row.getLastCellNum();
-//                for (int i = 1; i <= cells - 3; i++) {
-//                    templateData.setTemplateId(row.getCell(2 + i).getRawValue());
-//                    QcTemplateData data = qcMapper.selectTemplateData(templateData);
-//                    templateData.setSamplingLevelNo(data.getSamplingLevelNo());
-//                    templateData.setInspectionCycle(data.getInspectionCycle());
-//                    templateData.setSamplingProgrammeNo(data.getSamplingProgrammeNo());
-//                    templateData.setAql(data.getAql());
-//                    templateData.setAc(data.getAc());
-//                    templateData.setRe(data.getRe());
-//                    templateData.setAttributeType(task.getAttributeType());
-//                    // 新增
-//                    qcMapper.savePartAttributeDetails(templateData);
-//                }
-//            }
-//        }catch (Exception e){
-//            throw new RuntimeException("导入失败："+e.getMessage());
-//        }
     }
 
 
     // ======================= 类别属性设置维护 =======================
 
     /**
-     * @description: 查询类别属性
-     * @author: fengyuan_yang
-     * @date: 2023/4/21 9:10
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.PageUtils
+     * 查询类别属性
      **/
     @Override
     public PageUtils qcFamilyAttributeSearch(QcPartAttributeData data) {
@@ -1881,11 +1491,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 新增类别属性
-     * @author: fengyuan_yang
-     * @date: 2023/4/21 9:30
-     * @param: [data]
-     * @return: void
+     * 新增类别属性
      **/
     @Override
     public void qcFamilyAttributeSave(QcPartAttributeData data) {
@@ -1900,11 +1506,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 删除类别属性
-     * @author: fengyuan_yang
-     * @date: 2023/4/21 9:57
-     * @param: [data]
-     * @return: void
+     * 删除类别属性
      **/
     @Override
     @Transactional
@@ -1916,11 +1518,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 类别属性导入
-     * @author: fengyuan_yang
-     * @date: 2023/4/23 15:59
-     * @param: [file]
-     * @return: void
+     * 类别属性导入
      **/
     @Override
     @Transactional
@@ -1983,11 +1581,7 @@ public class QcServiceImpl implements QcService {
     // ======================= 抽样方案维护 =======================
 
     /**
-     * @description: 查询抽样方案
-     * @author: fengyuan_yang
-     * @date: 2023/4/21 13:34
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.PageUtils
+     * 查询抽样方案
      **/
     @Override
     public PageUtils samplingProgrammeSearch(QcSamplingInspectionProgrammeData data) {
@@ -1996,11 +1590,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 新增抽样方案
-     * @author: fengyuan_yang
-     * @date: 2023/4/21 13:47
-     * @param: [data]
-     * @return: void
+     * 新增抽样方案
      **/
     @Override
     public void samplingProgrammeSave(QcSamplingInspectionProgrammeData data) {
@@ -2028,11 +1618,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 删除抽样方案
-     * @author: fengyuan_yang
-     * @date: 2023/4/23 9:02
-     * @param: [data]
-     * @return: void
+     * 删除抽样方案
      **/
     @Override
     @Transactional
@@ -2044,11 +1630,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 搜索抽样方案中的矩阵
-     * @author: fengyuan_yang
-     * @date: 2023/4/21 15:53
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcSamplingInspectionProgrammeData>
+     * 搜索抽样方案中的矩阵
      **/
     @Override
     public List<QcSamplingInspectionProgrammeData> searchSamplingProgrammeDetails(QcSamplingInspectionProgrammeData data) {
@@ -2057,11 +1639,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 获取该方案不包含的矩阵
-     * @author: fengyuan_yang
-     * @date: 2023/4/21 16:40
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcSamplingInspectionProgrammeData>
+     * 获取该方案不包含的矩阵
      **/
     @Override
     public List<QcSamplingInspectionProgrammeData> getPlanList(QcSamplingInspectionProgrammeData data) {
@@ -2070,11 +1648,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 获取当前方案所包含的矩阵
-     * @author: fengyuan_yang
-     * @date: 2023/4/21 16:40
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcSamplingInspectionProgrammeData>
+     * 获取当前方案所包含的矩阵
      **/
     @Override
     public List<QcSamplingInspectionProgrammeData> getProgrammePlanList(QcSamplingInspectionProgrammeData data) {
@@ -2083,11 +1657,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 新增抽样方案中的矩阵
-     * @author: fengyuan_yang
-     * @date: 2023/4/21 17:42
-     * @param: [data]
-     * @return: void
+     * 新增抽样方案中的矩阵
      **/
     @Override
     @Transactional
@@ -2108,11 +1678,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 删除抽样方案中的矩阵
-     * @author: fengyuan_yang
-     * @date: 2023/4/21 17:53
-     * @param: [data]
-     * @return: void
+     * 删除抽样方案中的矩阵
      **/
     @Override
     @Transactional
@@ -2137,11 +1703,7 @@ public class QcServiceImpl implements QcService {
     // ======================= FAI检验维护 =======================
 
     /**
-     * @description: FAI检验记录查询
-     * @author: fengyuan_yang
-     * @date: 2023/4/24 10:25
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.PageUtils
+     * FAI检验记录查询
      **/
     @Override
     @Transactional
@@ -2152,11 +1714,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 新增FAI检验
-     * @author: fengyuan_yang
-     * @date: 2023/9/18 10:04
-     * @param: [data]
-     * @return: void
+     * 新增FAI检验
      **/
     @Override
     @Transactional
@@ -2375,11 +1933,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: FAI明细记录查询
-     * @author: fengyuan_yang
-     * @date: 2023/4/25 9:17
-     * @param: [data]
-     * @return: void
+     * FAI明细记录查询
      **/
     @Override
     public List<QcFAIRecordData> faiDetailSearch(QcFAIRecordData data) {
@@ -2388,11 +1942,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 保存检验记录
-     * @author: fengyuan_yang
-     * @date: 2023/3/29 17:08
-     * @param: [data]
-     * @return: void
+     * 保存检验记录
      **/
     @Override
     @Transactional
@@ -2443,8 +1993,6 @@ public class QcServiceImpl implements QcService {
 
     /**
      * 发送邮件
-     * @param data
-     * @param type
      */
     public void sendMail(QcFAIRecordData data, String type) throws Exception {
         // 获取数据库设置的邮件接收地址
@@ -2501,11 +2049,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 删除检验记录
-     * @author: fengyuan_yang
-     * @date: 2023/3/30 9:04
-     * @param: [data]
-     * @return: void
+     * 删除检验记录
      **/
     @Override
     @Transactional
@@ -2533,11 +2077,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 审核
-     * @author: fengyuan_yang
-     * @date: 2023/3/31 17:17
-     * @param: [data]
-     * @return: void
+     * 审核
      **/
     @Override
     @Transactional
@@ -2563,11 +2103,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 检查FAI是否已提交
-     * @author: fengyuan_yang
-     * @date: 2023/4/5 9:51
-     * @param: [data]
-     * @return: java.lang.Integer
+     * 检查FAI是否已提交
      **/
     @Override
     public Integer checkFAIIsSubmit(SubDetailValues data) {
@@ -2580,11 +2116,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 新增FAI子明细信息
-     * @author: fengyuan_yang
-     * @date: 2023/4/4 14:28
-     * @param: [data]
-     * @return: void
+     * 新增FAI子明细信息
      **/
     @Override
     @Transactional
@@ -2638,8 +2170,6 @@ public class QcServiceImpl implements QcService {
 
     /**
      * 正则表达式判断是否是数字字符串（可判断正数，负数和小数）
-     * @param str
-     * @return
      */
     public boolean isNumberString(String str) {
         Pattern pattern = Pattern.compile("-?[0-9]+(\\.[0-9]+)?");
@@ -2648,11 +2178,7 @@ public class QcServiceImpl implements QcService {
 
 
     /**
-     * @description: 查询FAI的子明细
-     * @author: fengyuan_yang
-     * @date: 2023/4/4 16:08
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.SubDetailValues>
+     * 查询FAI的子明细
      **/
     @Override
     public List<SubDetailValues> selectFAISubDetailedRecord(SubDetailValues data) {
@@ -2661,11 +2187,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 检查子明细中的实测值是否在规定范围
-     * @author: fengyuan_yang
-     * @date: 2023/4/6 16:14
-     * @param: [data]
-     * @return: java.lang.Integer
+     * 检查子明细中的实测值是否在规定范围
      **/
     @Override
     public Integer checkFAISubDetailValue(CheckSubDetailValueVo data) {
@@ -2682,11 +2204,7 @@ public class QcServiceImpl implements QcService {
     // ======================= FQC检验维护 =======================
 
     /**
-     * @description: FQC记录查询
-     * @author: fengyuan_yang
-     * @date: 2023/9/18 11:35
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.PageUtils
+     * FQC记录查询
      **/
     @Override
     public PageUtils qcFQCInspectionSearch(QcFAIRecordData data) {
@@ -2696,11 +2214,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: FQC记录新增
-     * @author: fengyuan_yang
-     * @date: 2023/9/18 11:35
-     * @param: [data]
-     * @return: void
+     * FQC记录新增
      **/
     @Override
     @Transactional
@@ -2918,11 +2432,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: FQC明细记录查询
-     * @author: fengyuan_yang
-     * @date: 2023/9/18 13:05
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcFAIRecordData>
+     * FQC明细记录查询
      **/
     @Override
     public List<QcFAIRecordData> fqcDetailSearch(QcFAIRecordData data) {
@@ -2931,11 +2441,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 删除FQC检验记录
-     * @author: fengyuan_yang
-     * @date: 2023/9/18 13:08
-     * @param: [data]
-     * @return: void
+     * 删除FQC检验记录
      **/
     @Override
     @Transactional
@@ -2961,11 +2467,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 保存FQC检验记录
-     * @author: fengyuan_yang
-     * @date: 2023/9/18 13:13
-     * @param: [data]
-     * @return: void
+     * 保存FQC检验记录
      **/
     @Override
     @Transactional
@@ -3008,18 +2510,10 @@ public class QcServiceImpl implements QcService {
         if (!operators.isEmpty()) {
             qcMapper.saveOperator(operators);
         }
-//        // 新增数据采集信息
-//        if (!data.getSubDetailList().isEmpty()) {
-//            qcMapper.saveFQCSubDetailed(data.getSubDetailList());
-//        }
     }
 
     /**
-     * @description: FQC审核
-     * @author: fengyuan_yang
-     * @date: 2023/9/18 13:21
-     * @param: [data]
-     * @return: void
+     * FQC审核
      **/
     @Override
     @Transactional
@@ -3045,11 +2539,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 新增FQC子明细
-     * @author: fengyuan_yang
-     * @date: 2023/9/18 13:26
-     * @param: [data]
-     * @return: void
+     * 新增FQC子明细
      **/
     @Override
     @Transactional
@@ -3101,11 +2591,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 查询FQC子明细
-     * @author: fengyuan_yang
-     * @date: 2023/9/18 13:29
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.SubDetailValues>
+     * 查询FQC子明细
      **/
     @Override
     public List<SubDetailValues> selectFQCSubDetailedRecord(SubDetailValues data) {
@@ -3114,11 +2600,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 检查是否已提交
-     * @author: fengyuan_yang
-     * @date: 2023/9/18 13:31
-     * @param: [data]
-     * @return: java.lang.Integer
+     * 检查是否已提交
      **/
     @Override
     public Integer checkFQCIsSubmit(SubDetailValues data) {
@@ -3131,11 +2613,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 检查FQC子明细中的实测值是否在规定范围
-     * @author: fengyuan_yang
-     * @date: 2023/9/18 13:36
-     * @param: [data]
-     * @return: java.lang.Integer
+     * 检查FQC子明细中的实测值是否在规定范围
      **/
     @Override
     public Integer checkFQCSubDetailValue(CheckSubDetailValueVo data) {
@@ -3153,11 +2631,7 @@ public class QcServiceImpl implements QcService {
     // ======================= IPQC检验维护 =======================
 
     /**
-     * @description: IPQC检验记录查询
-     * @author: fengyuan_yang
-     * @date: 2023/4/26 16:01
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.PageUtils
+     * IPQC检验记录查询
      **/
     @Override
     @Transactional
@@ -3168,11 +2642,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 检查动控是否开启
-     * @author: fengyuan_yang
-     * @date: 2023/10/18 13:23
-     * @param: [data]
-     * @return: com.xujie.sys.modules.sys.entity.SysSceneDynamicControlModelEntity
+     * 检查动控是否开启
      **/
     @Override
     public List<SysSceneDynamicControlModelEntity> queryController(SysSceneDynamicControlModelEntity data) {
@@ -3181,11 +2651,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 获取检验模板列表
-     * @author: fengyuan_yang
-     * @date: 2023/10/18 13:51
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcTemplateData>
+     * 获取检验模板列表
      **/
     @Override
     public List<QcTemplateData> queryTemplateList(QcTemplateData data) {
@@ -3201,11 +2667,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 新增IPQC记录
-     * @author: fengyuan_yang
-     * @date: 2023/4/28 8:56
-     * @param: [data]
-     * @return: void
+     * 新增IPQC记录
      **/
     @Override
     @Transactional
@@ -3437,11 +2899,360 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: IPQC明细记录查询
-     * @author: fengyuan_yang
-     * @date: 2023/4/26 17:03
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcFAIRecordData>
+     * 任务重载
+     */
+    @Override
+    @Transactional
+    public void ipqcRecordOverLoad(QcFAIRecordData data) {
+        for (QcFAIRecordData recordData : data.getSubmitList()){
+            // 先从明细表查出模板编码
+            List<QcDetailInformationData> detailInfoList = qcMapper.getIPQCDetailInfo(recordData.getSite(), recordData.getBuNo(), recordData.getInspectionNo());
+            if (detailInfoList.isEmpty()) {
+                throw new RuntimeException("检验单号[" + recordData.getInspectionNo() + "]不存在检验明细，请检查!");
+            }
+            recordData.setTemplateId(detailInfoList.get(0).getTemplateId());
+            // 删除明细记录信息
+            qcMapper.deleteIPQCDetailedRecord(recordData);
+            // 删除子明细记录信息
+            qcMapper.deleteIPQCSubDetailedRecord(recordData);
+            // 删除文件
+            qcMapper.deleteInspectionFiles(recordData);
+
+            // 根据用户选择的模板编码获取模板详情
+            List<QcFAIRecordData> partAttribute = qcMapper.selectTemplate(recordData);
+            QcFAIRecordData data1 = partAttribute.get(0);
+            // 获取检验周期
+            if (data1.getInspectionCycle() != null) {
+                recordData.setInspectionCycle(data1.getInspectionCycle());
+            }
+            // 获取抽样数量
+            // 如果该检验模板有维护抽样方案
+            if (StringUtils.isNotBlank(data1.getSamplingProgrammeNo())) {
+                QcSamplingInspectionProgrammeData samplingInspectionProgrammeData = new QcSamplingInspectionProgrammeData();
+                samplingInspectionProgrammeData.setSite(data1.getSite());
+                samplingInspectionProgrammeData.setBuNo(data1.getBuNo());
+                samplingInspectionProgrammeData.setSamplingProgrammeNo(data1.getSamplingProgrammeNo());
+                // 获取抽样方案维护的矩阵详情
+                List<QcSamplingInspectionProgrammeData> dataList = qcMapper.searchSamplingProgrammeDetails(samplingInspectionProgrammeData);
+                // 根据抽样方案确定抽样数
+                for (QcSamplingInspectionProgrammeData programmeData : dataList) {
+                    if (programmeData.getSamplingLevelNo().equals(data1.getSamplingLevelNo()) && (recordData.getRollQty().compareTo(programmeData.getMinQty()) > 0 || recordData.getRollQty().compareTo(programmeData.getMinQty()) == 0) && (recordData.getRollQty().compareTo(programmeData.getMaxQty()) < 0 || recordData.getRollQty().compareTo(programmeData.getMaxQty()) == 0) ){
+                        recordData.setSamplingQty(programmeData.getSamplingQty());
+                    }
+                }
+            } else if (data1.getDefaultSamplingQuantity() != null) {
+                // 没有维护抽样方案，再根据默认抽样数来确定
+                recordData.setSamplingQty(data1.getDefaultSamplingQuantity());
+            } else if (data1.getDefaultSamplingProportion() != null) {
+                // 也没有维护默认抽样数，最后根据默认抽样比例来确定
+                recordData.setSamplingQty(data1.getDefaultSamplingProportion().multiply(recordData.getRollQty()).divide(new BigDecimal(100),3,BigDecimal.ROUND_HALF_UP));
+            }
+
+            // 获取根据该检验模板下维护的检验项目
+            QcTemplateData templateData = new QcTemplateData();
+            templateData.setSite(recordData.getSite());
+            templateData.setBuNo(recordData.getBuNo());
+            templateData.setTemplateId(data1.getTemplateId());
+            templateData.setItemType("D");
+            List<QcTemplateData> itemList = qcMapper.templateDetailsSearch(templateData);
+            List<QcFAIRecordData> saveItemList = new ArrayList<>();
+            for (QcTemplateData qcTemplateData : itemList) {
+                QcFAIRecordData faiRecordData = new QcFAIRecordData();
+                BeanUtils.copyProperties(qcTemplateData, faiRecordData);
+                faiRecordData.setInspectionNo(recordData.getInspectionNo()); // 检验单号
+                faiRecordData.setOrderNo(recordData.getOrderNo()); // 工单号
+                faiRecordData.setTemplateId(data1.getTemplateId()); // 模板编码
+                faiRecordData.setAql(data1.getAql()); // aql
+                faiRecordData.setAc(data1.getAc()); // ac
+                faiRecordData.setRe(data1.getRe()); // re
+                faiRecordData.setSamplingQty(null);
+                // 获取抽样数量
+                // 如果该检验项目有维护抽样方案
+                if (StringUtils.isNotBlank(qcTemplateData.getSamplingProgrammeNo())) {
+                    QcSamplingInspectionProgrammeData samplingInspectionProgrammeData = new QcSamplingInspectionProgrammeData();
+                    samplingInspectionProgrammeData.setSite(qcTemplateData.getSite());
+                    samplingInspectionProgrammeData.setBuNo(qcTemplateData.getBuNo());
+                    samplingInspectionProgrammeData.setSamplingProgrammeNo(qcTemplateData.getSamplingProgrammeNo());
+                    // 获取抽样方案维护的矩阵详情
+                    List<QcSamplingInspectionProgrammeData> dataList = qcMapper.searchSamplingProgrammeDetails(samplingInspectionProgrammeData);
+                    // 根据抽样方案确定抽样数
+                    for (QcSamplingInspectionProgrammeData programmeData : dataList) {
+                        if (programmeData.getSamplingLevelNo().equals(qcTemplateData.getSamplingLevelNo()) && (recordData.getRollQty().compareTo(programmeData.getMinQty()) > 0 || recordData.getRollQty().compareTo(programmeData.getMinQty()) == 0) && (recordData.getRollQty().compareTo(programmeData.getMaxQty()) < 0 || recordData.getRollQty().compareTo(programmeData.getMaxQty()) == 0)) {
+                            faiRecordData.setSamplingQty(programmeData.getSamplingQty());
+                        }
+                    }
+                } else if (qcTemplateData.getItemSamplingQuantity() != null) {
+                    // 没有维护抽样方案，再根据默认抽样数来确定
+                    faiRecordData.setSamplingQty(qcTemplateData.getItemSamplingQuantity());
+                } else if (qcTemplateData.getDefaultSamplingProportion() != null) {
+                    // 也没有维护默认抽样数，最后根据默认抽样比例来确定
+                    faiRecordData.setSamplingQty(qcTemplateData.getDefaultSamplingProportion().multiply(recordData.getRollQty()).divide(new BigDecimal(100), 3, BigDecimal.ROUND_HALF_UP));
+                } else {
+                    // 最后则根据检验单抽样数量赋值
+                    faiRecordData.setSamplingQty(recordData.getSamplingQty()); // 抽样数量
+                }
+                saveItemList.add(faiRecordData);
+            }
+            // 新增IPQC明细记录信息
+            qcMapper.saveIPQCDetailedRecords(saveItemList);
+            // 更新IQC主记录信息
+            qcMapper.updateIPQCRecord(recordData);
+        }
+    }
+
+    /**
+     * 批量新增IPQC记录
+     */
+    @Override
+    @Transactional
+    public void batchSaveOsInspection(QcFAIRecordData data) {
+        // 获得 site 和 bu
+        if (data.getBu().split("_").length >= 2 ) {
+            data.setSite(data.getBu().split("_")[0]);
+            data.setBuNo(data.getBu().split("_")[1]);
+        } else {
+            throw new RuntimeException("工厂和部门有误!");
+        }
+        List<QcFAIRecordData> dataList = data.getSubmitList().stream().map(a -> {
+            a.setFlag(data.getFlag());
+            a.setSite(data.getSite());
+            a.setBuNo(data.getBuNo());
+            a.setInspectionTypeNo(data.getInspectionTypeNo());
+            a.setTemplateId(data.getTemplateId());
+            a.setImportantFlag(data.getImportantFlag());
+            a.setSpecialRequirements(data.getSpecialRequirements());
+            a.setCreateBy(data.getCreateBy());
+            BigDecimal qtyRequired = null;
+            try {
+                qtyRequired = new BigDecimal(a.getQtyrequired() != null ? a.getQtyrequired() : "0");
+            } catch (NumberFormatException e) {
+                // 设置默认值 0
+                qtyRequired = BigDecimal.ZERO;
+            }
+            // 获取 rollQty 并处理可能的 null
+            BigDecimal rollQty = a.getRollQty() != null ? a.getRollQty() : BigDecimal.ZERO;
+            // 计算差值
+            BigDecimal difference = qtyRequired.subtract(rollQty);
+            a.setRollQty(difference.compareTo(BigDecimal.ZERO) > 0 ? difference : BigDecimal.ZERO);
+            return a;
+        }).collect(Collectors.toList());
+
+        // 检查动控是否已开启
+        SysSceneDynamicControlModelEntity controlModel = new SysSceneDynamicControlModelEntity();
+        controlModel.setSite(data.getSite());
+        controlModel.setControlNo("10004");
+        List<SysSceneDynamicControlModelEntity> controlList = qcMapper.queryController(controlModel);
+        String controlFlag = controlList.get(0).getBaseData();
+
+        if ("控制".equals(controlFlag)) {
+            // 根据用户选择的模板编码获取模板详情
+            List<QcFAIRecordData> partAttribute = qcMapper.selectTemplate(data);
+            QcFAIRecordData data1 = partAttribute.get(0);
+            // 获取根据该检验模板下维护的检验项目
+            QcTemplateData templateData = new QcTemplateData();
+            templateData.setSite(data.getSite());
+            templateData.setBuNo(data.getBuNo());
+            templateData.setTemplateId(data.getTemplateId());
+            templateData.setItemType("D");
+            List<QcTemplateData> itemList = qcMapper.templateDetailsSearch(templateData);
+            for (QcFAIRecordData inData : dataList) {
+                // 获取检验周期
+                if (data1.getInspectionCycle() != null) {
+                    inData.setInspectionCycle(data1.getInspectionCycle());
+                }
+                packageSaveIPQCInspectionControl(inData, data1, itemList);
+            }
+        } else {
+            for (QcFAIRecordData inData : dataList) {
+                packageSaveIPQCInspectionNotControl(inData);
+            }
+        }
+    }
+
+    @Transactional
+    public void packageSaveIPQCInspectionControl(QcFAIRecordData data, QcFAIRecordData data1, List<QcTemplateData> itemList) {
+        String InspectionNo = qcMapper.selectIPQCInspectionNo(data);
+        data.setInspectionNo("IPQC" + InspectionNo);
+        data.setState("未开始");
+        // 获取抽样数量
+        // 如果该检验模板有维护抽样方案
+        if (StringUtils.isNotBlank(data1.getSamplingProgrammeNo())) {
+            QcSamplingInspectionProgrammeData samplingInspectionProgrammeData = new QcSamplingInspectionProgrammeData();
+            samplingInspectionProgrammeData.setSite(data1.getSite());
+            samplingInspectionProgrammeData.setBuNo(data1.getBuNo());
+            samplingInspectionProgrammeData.setSamplingProgrammeNo(data1.getSamplingProgrammeNo());
+            // 获取抽样方案维护的矩阵详情
+            List<QcSamplingInspectionProgrammeData> dataList = qcMapper.searchSamplingProgrammeDetails(samplingInspectionProgrammeData);
+            // 根据抽样方案确定抽样数
+            for (QcSamplingInspectionProgrammeData programmeData : dataList) {
+                if (programmeData.getSamplingLevelNo().equals(data1.getSamplingLevelNo()) && (data.getRollQty().compareTo(programmeData.getMinQty()) > 0 || data.getRollQty().compareTo(programmeData.getMinQty()) == 0) && (data.getRollQty().compareTo(programmeData.getMaxQty()) < 0 || data.getRollQty().compareTo(programmeData.getMaxQty()) == 0) ){
+                    data.setSamplingQty(programmeData.getSamplingQty());
+                }
+            }
+        } else if (data1.getDefaultSamplingQuantity() != null) {
+            // 没有维护抽样方案，再根据默认抽样数来确定
+            data.setSamplingQty(data1.getDefaultSamplingQuantity());
+        } else if (data1.getDefaultSamplingProportion() != null) {
+            // 也没有维护默认抽样数，最后根据默认抽样比例来确定
+            data.setSamplingQty(data1.getDefaultSamplingProportion().multiply(data.getRollQty()).divide(new BigDecimal(100),3,BigDecimal.ROUND_HALF_UP));
+        }
+
+        List<QcFAIRecordData> saveItemList = new ArrayList<>();
+        // 获取根据该检验模板下维护的检验项目
+        for (QcTemplateData qcTemplateData : itemList) {
+            QcFAIRecordData faiRecordData = new QcFAIRecordData();
+            BeanUtils.copyProperties(qcTemplateData, faiRecordData);
+            faiRecordData.setInspectionNo(data.getInspectionNo()); // 检验单号
+            faiRecordData.setOrderNo(data.getOrderNo()); // 工单号
+            faiRecordData.setTemplateId(data1.getTemplateId()); // 模板编码
+            faiRecordData.setAql(data1.getAql()); // aql
+            faiRecordData.setAc(data1.getAc()); // ac
+            faiRecordData.setRe(data1.getRe()); // re
+            faiRecordData.setSamplingQty(null);
+            // 获取抽样数量
+            // 如果该检验项目有维护抽样方案
+            if (StringUtils.isNotBlank(qcTemplateData.getSamplingProgrammeNo())) {
+                QcSamplingInspectionProgrammeData samplingInspectionProgrammeData = new QcSamplingInspectionProgrammeData();
+                samplingInspectionProgrammeData.setSite(qcTemplateData.getSite());
+                samplingInspectionProgrammeData.setBuNo(qcTemplateData.getBuNo());
+                samplingInspectionProgrammeData.setSamplingProgrammeNo(qcTemplateData.getSamplingProgrammeNo());
+                // 获取抽样方案维护的矩阵详情
+                List<QcSamplingInspectionProgrammeData> dataList = qcMapper.searchSamplingProgrammeDetails(samplingInspectionProgrammeData);
+                // 根据抽样方案确定抽样数
+                for (QcSamplingInspectionProgrammeData programmeData : dataList) {
+                    if (programmeData.getSamplingLevelNo().equals(qcTemplateData.getSamplingLevelNo()) && (data.getRollQty().compareTo(programmeData.getMinQty()) > 0 || data.getRollQty().compareTo(programmeData.getMinQty()) == 0) && (data.getRollQty().compareTo(programmeData.getMaxQty()) < 0 || data.getRollQty().compareTo(programmeData.getMaxQty()) == 0)) {
+                        faiRecordData.setSamplingQty(programmeData.getSamplingQty());
+                    }
+                }
+            } else if (qcTemplateData.getItemSamplingQuantity() != null) {
+                // 没有维护抽样方案，再根据默认抽样数来确定
+                faiRecordData.setSamplingQty(qcTemplateData.getItemSamplingQuantity());
+            } else if (qcTemplateData.getDefaultSamplingProportion() != null) {
+                // 也没有维护默认抽样数，最后根据默认抽样比例来确定
+                faiRecordData.setSamplingQty(qcTemplateData.getDefaultSamplingProportion().multiply(data.getRollQty()).divide(new BigDecimal(100), 3, BigDecimal.ROUND_HALF_UP));
+            } else {
+                // 最后则根据检验单抽样数量赋值
+                faiRecordData.setSamplingQty(data.getSamplingQty());
+            }
+            saveItemList.add(faiRecordData);
+        }
+        // 新增IPQC明细记录信息
+        if (!saveItemList.isEmpty()) {
+            qcMapper.saveIPQCDetailedRecords(saveItemList);
+        }
+
+        // 新增IPQC主记录信息
+        if (!StringUtils.isNotBlank(data.getImportantFlag())) {
+            data.setImportantFlag("N");
+        }
+        qcMapper.saveIPQCRecord(data);
+        // 派工单生成检验任务, 更新已送检数量
+        qcMapper.updateSOScheduledRoutingRollQty(data.getSite(), data.getSeqNo(), data.getRollQty());
+        // 修改派工单表里的记录标识 2024-12-23
+        qcMapper.updateSOScheduledRoutingTypeFlag(data.getSite(), data.getSeqNo(), data.getInspectionTypeNo());
+    }
+
+    @Transactional
+    public void packageSaveIPQCInspectionNotControl(QcFAIRecordData data) {
+        String InspectionNo = qcMapper.selectIPQCInspectionNo(data);
+        data.setInspectionNo("IPQC" + InspectionNo);
+        data.setState("未开始");
+        // 明细记录信息赋值
+        String partNo = data.getPartNo();
+        String attributeType1 = "A";
+        // 获取该物料属性下维护的IPQC检验模板
+        String operationDesc = "";
+        String resourceId = "";
+        if (StringUtils.isNotBlank(data.getOperationDesc())) {
+            operationDesc = data.getOperationDesc();
+        }
+        if (StringUtils.isNotBlank(data.getResourceId())) {
+            resourceId = data.getResourceId();
+        }
+        List<QcFAIRecordData> partAttribute = qcMapper.selectPartAttributeByOperationAndResource(data.getSite(), data.getBuNo(), partNo, attributeType1, data.getInspectionTypeNo(),operationDesc, resourceId);
+        if (!partAttribute.isEmpty()) {
+            QcFAIRecordData data1 = partAttribute.get(0);
+            // 获取检验周期
+            if (data1.getInspectionCycle() != null) {
+                data.setInspectionCycle(data1.getInspectionCycle());
+            }
+            // 获取抽样数量
+            // 如果该检验模板有维护抽样方案
+            if (StringUtils.isNotBlank(data1.getSamplingProgrammeNo())) {
+                QcSamplingInspectionProgrammeData samplingInspectionProgrammeData = new QcSamplingInspectionProgrammeData();
+                samplingInspectionProgrammeData.setSite(data1.getSite());
+                samplingInspectionProgrammeData.setBuNo(data1.getBuNo());
+                samplingInspectionProgrammeData.setSamplingProgrammeNo(data1.getSamplingProgrammeNo());
+                // 获取抽样方案维护的矩阵详情
+                List<QcSamplingInspectionProgrammeData> dataList = qcMapper.searchSamplingProgrammeDetails(samplingInspectionProgrammeData);
+                // 根据抽样方案确定抽样数
+                for (QcSamplingInspectionProgrammeData programmeData : dataList) {
+                    if (programmeData.getSamplingLevelNo().equals(data1.getSamplingLevelNo()) && (data.getRollQty().compareTo(programmeData.getMinQty()) > 0 || data.getRollQty().compareTo(programmeData.getMinQty()) == 0) && (data.getRollQty().compareTo(programmeData.getMaxQty()) < 0 || data.getRollQty().compareTo(programmeData.getMaxQty()) == 0) ){
+                        data.setSamplingQty(programmeData.getSamplingQty());
+                    }
+                }
+            } else if (data1.getDefaultSamplingQuantity() != null) {
+                // 没有维护抽样方案，再根据默认抽样数来确定
+                data.setSamplingQty(data1.getDefaultSamplingQuantity());
+            } else if (data1.getDefaultSamplingProportion() != null) {
+                // 也没有维护默认抽样数，最后根据默认抽样比例来确定
+                data.setSamplingQty(data1.getDefaultSamplingProportion().multiply(data.getRollQty()).divide(new BigDecimal(100),3,BigDecimal.ROUND_HALF_UP));
+            }
+
+            // 获取根据该检验模板下维护的检验项目
+            QcTemplateData templateData = new QcTemplateData();
+            templateData.setSite(data.getSite());
+            templateData.setBuNo(data.getBuNo());
+            templateData.setTemplateId(data1.getTemplateId());
+            templateData.setItemType("D");
+            List<QcTemplateData> itemList = qcMapper.templateDetailsSearch(templateData);
+            List<QcFAIRecordData> saveItemList = new ArrayList<>();
+            for (QcTemplateData qcTemplateData : itemList) {
+                QcFAIRecordData faiRecordData = new QcFAIRecordData();
+                BeanUtils.copyProperties(qcTemplateData, faiRecordData);
+                faiRecordData.setInspectionNo(data.getInspectionNo()); // 检验单号
+                faiRecordData.setOrderNo(data.getOrderNo()); // 工单号
+                faiRecordData.setTemplateId(data1.getTemplateId()); // 模板编码
+                faiRecordData.setAql(data1.getAql()); // aql
+                faiRecordData.setAc(data1.getAc()); // ac
+                faiRecordData.setRe(data1.getRe()); // re
+                faiRecordData.setSamplingQty(null);
+                // 获取抽样数量
+                // 如果该检验项目有维护抽样方案
+                if (StringUtils.isNotBlank(qcTemplateData.getSamplingProgrammeNo())) {
+                    QcSamplingInspectionProgrammeData samplingInspectionProgrammeData = new QcSamplingInspectionProgrammeData();
+                    samplingInspectionProgrammeData.setSite(qcTemplateData.getSite());
+                    samplingInspectionProgrammeData.setBuNo(qcTemplateData.getBuNo());
+                    samplingInspectionProgrammeData.setSamplingProgrammeNo(qcTemplateData.getSamplingProgrammeNo());
+                    // 获取抽样方案维护的矩阵详情
+                    List<QcSamplingInspectionProgrammeData> dataList = qcMapper.searchSamplingProgrammeDetails(samplingInspectionProgrammeData);
+                    // 根据抽样方案确定抽样数
+                    for (QcSamplingInspectionProgrammeData programmeData : dataList) {
+                        if (programmeData.getSamplingLevelNo().equals(qcTemplateData.getSamplingLevelNo()) && (data.getRollQty().compareTo(programmeData.getMinQty()) > 0 || data.getRollQty().compareTo(programmeData.getMinQty()) == 0) && (data.getRollQty().compareTo(programmeData.getMaxQty()) < 0 || data.getRollQty().compareTo(programmeData.getMaxQty()) == 0)) {
+                            faiRecordData.setSamplingQty(programmeData.getSamplingQty());
+                        }
+                    }
+                } else if (qcTemplateData.getItemSamplingQuantity() != null) {
+                    // 没有维护抽样方案，再根据默认抽样数来确定
+                    faiRecordData.setSamplingQty(qcTemplateData.getItemSamplingQuantity());
+                } else if (qcTemplateData.getDefaultSamplingProportion() != null) {
+                    // 也没有维护默认抽样数，最后根据默认抽样比例来确定
+                    faiRecordData.setSamplingQty(qcTemplateData.getDefaultSamplingProportion().multiply(data.getRollQty()).divide(new BigDecimal(100), 3, BigDecimal.ROUND_HALF_UP));
+                } else {
+                    // 最后则根据检验单抽样数量赋值
+                    faiRecordData.setSamplingQty(data.getSamplingQty());
+                }
+                saveItemList.add(faiRecordData);
+            }
+            // 新增IPQC明细记录信息
+            if (!saveItemList.isEmpty()) {
+                qcMapper.saveIPQCDetailedRecords(saveItemList);
+            }
+        }
+    }
+
+    /**
+     * IPQC明细记录查询
      **/
     @Override
     public List<QcFAIRecordData> ipqcDetailSearch(QcFAIRecordData data) {
@@ -3450,11 +3261,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 删除IPQC检验记录
-     * @author: fengyuan_yang
-     * @date: 2023/4/26 17:10
-     * @param: [data]
-     * @return: void
+     * 删除IPQC检验记录
      **/
     @Override
     @Transactional
@@ -3488,11 +3295,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 保存IPQC检验记录
-     * @author: fengyuan_yang
-     * @date: 2023/4/26 17:28
-     * @param: [data]
-     * @return: void
+     * 保存IPQC检验记录
      **/
     @Override
     @Transactional
@@ -3559,11 +3362,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: IPQC审核
-     * @author: fengyuan_yang
-     * @date: 2023/4/26 17:37
-     * @param: [data]
-     * @return: void
+     * IPQC审核
      **/
     @Override
     @Transactional
@@ -3575,26 +3374,11 @@ public class QcServiceImpl implements QcService {
             qcMapper.updateIPQCDetailSubmitFlag(qcData);
             // 修改子明细记录标识为已提交
             qcMapper.updateIPQCSubDetailSubmitFlag(qcData);
-            // 发送邮件
-//            if ("不合格".equals(qcData.getInspectionResult())) {
-//                try {
-//                    List<QcFAIRecordData> list = qcMapper.ipqcDetailSearch(qcData);
-//                    qcData.setItemList(list);
-//                    sendMail(qcData, "IPQC");
-//                } catch (Exception e) {
-//                    logger.info(e.getMessage());
-//                    //throw new RuntimeException(e.getMessage());
-//                }
-//            }
         }
     }
 
     /**
-     * @description: 新增IPQC子明细信息
-     * @author: fengyuan_yang
-     * @date: 2023/4/26 17:47
-     * @param: [data]
-     * @return: void
+     * 新增IPQC子明细信息
      **/
     @Override
     @Transactional
@@ -3647,11 +3431,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 查询IPQC子明细
-     * @author: fengyuan_yang
-     * @date: 2023/4/26 17:58
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.SubDetailValues>
+     * 查询IPQC子明细
      **/
     @Override
     public List<SubDetailValues> selectIPQCSubDetailedRecord(SubDetailValues data) {
@@ -3660,11 +3440,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 检查IPQC是否已提交
-     * @author: fengyuan_yang
-     * @date: 2023/4/27 9:01
-     * @param: [data]
-     * @return: java.lang.Integer
+     * 检查IPQC是否已提交
      **/
     @Override
     public Integer checkIPQCIsSubmit(SubDetailValues data) {
@@ -3677,11 +3453,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 检查IPQC子明细中的实测值是否在规定范围
-     * @author: fengyuan_yang
-     * @date: 2023/4/27 9:08
-     * @param: [data]
-     * @return: java.lang.Integer
+     * 检查IPQC子明细中的实测值是否在规定范围
      **/
     @Override
     public Integer checkIPQCSubDetailValue(CheckSubDetailValueVo data) {
@@ -3696,11 +3468,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 查询工序列表
-     * @author: fengyuan_yang
-     * @date: 2023/4/27 15:31
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcFAIRecordData>
+     * 查询工序列表
      **/
     @Override
     public List<QcFAIRecordData> getOperationList(QcFAIRecordData data) {
@@ -3715,40 +3483,22 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 查询机台列表
-     * @author: fengyuan_yang
-     * @date: 2023/4/27 17:02
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcFAIRecordData>
+     * 查询机台列表
      **/
     @Override
     public List<QcFAIRecordData> getResourceList(QcFAIRecordData data) {
         // 根据工单号和工序号查出所有数据
         List<QcFAIRecordData> list = qcMapper.getResourceList(data);
-//        // 去重
-//        List<QcFAIRecordData> collect = list.stream().collect(
-//                Collectors.collectingAndThen(
-//                        Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(QcFAIRecordData::getResourceId))), ArrayList::new
-//                ));
         return list;
     }
 
     /**
-     * @description: 查询物料列表
-     * @author: fengyuan_yang
-     * @date: 2023/4/27 17:36
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcFAIRecordData>
+     * 查询物料列表
      **/
     @Override
     public List<QcFAIRecordData> getPartList(QcFAIRecordData data) {
         // 根据工单号查出所有数据
         List<QcFAIRecordData> list = qcMapper.getOperationList(data);
-//        // 去重
-//        List<QcFAIRecordData> collect = list.stream().collect(
-//                Collectors.collectingAndThen(
-//                        Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(QcFAIRecordData::getPartNo))), ArrayList::new
-//                ));
         return list;
     }
 
@@ -3756,130 +3506,11 @@ public class QcServiceImpl implements QcService {
     // ======================= IQC检验维护 =======================
 
     /**
-     * @description: IQC检验记录查询
-     * @author: fengyuan_yang
-     * @date: 2023/4/29 13:39
-     * @param: [data]
-     * @return: com.xujie.sys.common.utils.PageUtils
+     * IQC检验记录查询
      **/
     @Override
     @Transactional
     public PageUtils qcIQCInspectionSearch(QcFAIRecordData data) {
-//        // 查询送检单里的全部数据
-//        List<QcFAIRecordData> basicData = qcMapper.selectIQCBasicData(data);
-//        // 新建对象存放主记录
-//        QcFAIRecordData qcFAIRecordData = new QcFAIRecordData();
-//        for (QcFAIRecordData recordData : basicData) {
-//            // 拿到供应商编码
-//            String supplierNo = "";
-//            if (StringUtils.isNotBlank(recordData.getSupplierNo())) {
-//                supplierNo = recordData.getSupplierNo();
-//            }
-//            // 主记录信息赋值
-//            qcFAIRecordData.setSite(recordData.getSite());
-//            qcFAIRecordData.setBuNo(recordData.getBuNo());
-//            qcFAIRecordData.setInspectionNo(recordData.getInspectionNo()); // 检验单号
-//            qcFAIRecordData.setInspectionTypeNo("105"); // 检验类型编码
-//            qcFAIRecordData.setPartDesc(recordData.getPartDesc());
-//            qcFAIRecordData.setRollQty(recordData.getRollQty());
-//            qcFAIRecordData.setSamplingQty(recordData.getSamplingQty());
-//            // 明细记录信息赋值
-//            String partNo = recordData.getPartNo();
-//            String attributeType1 = "A";
-//            // 获取该物料属性下维护的IQC检验模板
-//            List<QcFAIRecordData> partAttribute = qcMapper.selectPartAttributeByPartNo(recordData.getSite(), recordData.getBuNo(), partNo, attributeType1, qcFAIRecordData.getInspectionTypeNo(), supplierNo);
-//            if (!partAttribute.isEmpty()) {
-//                // 检验周期
-//                if (partAttribute.get(0).getInspectionCycle() != null) {
-//                    qcFAIRecordData.setInspectionCycle(partAttribute.get(0).getInspectionCycle());
-//                }
-//                // 获取抽样数量
-//                // 如果该检验模板有维护抽样方案
-////                if (StringUtils.isNotBlank(partAttribute.get(0).getSamplingProgrammeNo())) {
-////                    QcSamplingInspectionProgrammeData samplingInspectionProgrammeData = new QcSamplingInspectionProgrammeData();
-////                    samplingInspectionProgrammeData.setSite(partAttribute.get(0).getSite());
-////                    samplingInspectionProgrammeData.setBuNo(partAttribute.get(0).getBuNo());
-////                    samplingInspectionProgrammeData.setSamplingProgrammeNo(partAttribute.get(0).getSamplingProgrammeNo());
-////                    // 获取抽样方案维护的矩阵详情
-////                    List<QcSamplingInspectionProgrammeData> dataList = qcMapper.searchSamplingProgrammeDetails(samplingInspectionProgrammeData);
-////                    // 根据抽样方案确定抽样数
-////                    for (QcSamplingInspectionProgrammeData programmeData : dataList) {
-////                        if (programmeData.getSamplingLevelNo().equals(partAttribute.get(0).getSamplingLevelNo()) && (recordData.getRollCount().compareTo(programmeData.getMinQty()) > 0 || recordData.getRollCount().compareTo(programmeData.getMinQty()) == 0) && (recordData.getRollCount().compareTo(programmeData.getMaxQty()) < 0 || recordData.getRollCount().compareTo(programmeData.getMaxQty()) == 0) ){
-////                            qcFAIRecordData.setSamplingQty(programmeData.getSamplingQty());
-////                        }
-////                    }
-////                } else if (partAttribute.get(0).getDefaultSamplingQuantity() != null) {
-////                    // 没有维护抽样方案，再根据默认抽样数来确定
-////                    qcFAIRecordData.setSamplingQty(partAttribute.get(0).getDefaultSamplingQuantity());
-////                } else if (partAttribute.get(0).getDefaultSamplingProportion() != null) {
-////                    // 也没有维护默认抽样数，最后根据默认抽样比例来确定
-////                    BigDecimal d = partAttribute.get(0).getDefaultSamplingProportion().multiply(recordData.getRollCount()).divide(new BigDecimal(100), 3, BigDecimal.ROUND_HALF_UP);
-////                    qcFAIRecordData.setSamplingQty(d);
-////                }
-//
-//                // 获取根据该检验模板下维护的检验项目
-//                QcTemplateData templateData = new QcTemplateData();
-//                templateData.setSite(recordData.getSite());
-//                templateData.setBuNo(recordData.getBuNo());
-//                templateData.setTemplateId(partAttribute.get(0).getTemplateId());
-//                templateData.setItemType("D");
-//                List<QcTemplateData> itemList = qcMapper.templateDetailsSearch(templateData);
-//                QcFAIRecordData faiRecordData = new QcFAIRecordData();
-//                faiRecordData.setSite(recordData.getSite()); // 工厂
-//                faiRecordData.setBuNo(recordData.getBuNo()); // BU
-//                faiRecordData.setInspectionNo(qcFAIRecordData.getInspectionNo()); // 检验单号
-//                faiRecordData.setTemplateId(partAttribute.get(0).getTemplateId()); // 模板编码
-//                faiRecordData.setAql(partAttribute.get(0).getAql()); // aql
-//                faiRecordData.setAc(partAttribute.get(0).getAc()); // ac
-//                faiRecordData.setRe(partAttribute.get(0).getRe()); // re
-//                for (QcTemplateData itemData : itemList) {
-//                    faiRecordData.setSerialNo(itemData.getSerialNo()); // 序号
-//                    faiRecordData.setSamplingQty(null);
-//                    faiRecordData.setSamplingLevelNo(itemData.getSamplingLevelNo()); // 检验水平编码
-//                    faiRecordData.setSamplingLevelDesc(itemData.getSamplingLevelDesc()); // 检验水平名称
-//                    faiRecordData.setSamplingProgrammeNo(itemData.getSamplingProgrammeNo()); // 抽样方案编码
-//                    faiRecordData.setSamplingProgrammeDesc(itemData.getSamplingProgrammeDesc()); // 抽样方案名称
-//                    faiRecordData.setItemNo(itemData.getItemNo()); // 项目编码
-//                    faiRecordData.setItemDesc(itemData.getItemDesc()); // 项目名称
-//                    faiRecordData.setObjectId(itemData.getObjectID()); // 设备编码
-//                    faiRecordData.setObjectDesc(itemData.getObjectDesc()); // 设备名称
-//                    faiRecordData.setDefaultValue(itemData.getDefaultValue()); // 默认值
-//                    faiRecordData.setMinValue(itemData.getMinValue()); // 最小值
-//                    faiRecordData.setMaxValue(itemData.getMaxValue()); // 最大值
-//                    faiRecordData.setValueType(itemData.getValueType()); // 检测值类型
-//                    faiRecordData.setValueTypeDb(itemData.getValueTypeDb());
-//                    // 获取抽样数量
-//                    // 如果该检验项目有维护抽样方案
-//                    if (StringUtils.isNotBlank(itemData.getSamplingProgrammeNo())) {
-//                        QcSamplingInspectionProgrammeData samplingInspectionProgrammeData = new QcSamplingInspectionProgrammeData();
-//                        samplingInspectionProgrammeData.setSite(itemData.getSite());
-//                        samplingInspectionProgrammeData.setBuNo(itemData.getBuNo());
-//                        samplingInspectionProgrammeData.setSamplingProgrammeNo(itemData.getSamplingProgrammeNo());
-//                        // 获取抽样方案维护的矩阵详情
-//                        List<QcSamplingInspectionProgrammeData> dataList = qcMapper.searchSamplingProgrammeDetails(samplingInspectionProgrammeData);
-//                        // 根据抽样方案确定抽样数
-//                        for (QcSamplingInspectionProgrammeData programmeData : dataList) {
-//                            if (programmeData.getSamplingLevelNo().equals(itemData.getSamplingLevelNo()) && (recordData.getRollCount().compareTo(programmeData.getMinQty()) > 0 || recordData.getRollCount().compareTo(programmeData.getMinQty()) == 0) && (recordData.getRollCount().compareTo(programmeData.getMaxQty()) < 0 || recordData.getRollCount().compareTo(programmeData.getMaxQty()) == 0)) {
-//                                faiRecordData.setSamplingQty(programmeData.getSamplingQty());
-//                            }
-//                        }
-//                    } else if (itemData.getItemSamplingQuantity() != null) {
-//                        // 没有维护抽样方案，再根据默认抽样数来确定
-//                        faiRecordData.setSamplingQty(itemData.getItemSamplingQuantity());
-//                    } else if (itemData.getDefaultSamplingProportion() != null) {
-//                        // 也没有维护默认抽样数，最后根据默认抽样比例来确定
-//                        faiRecordData.setSamplingQty(itemData.getDefaultSamplingProportion().multiply(recordData.getRollCount()).divide(new BigDecimal(100), 3, BigDecimal.ROUND_HALF_UP));
-//                    } else {
-//                        // 最后则根据检验单抽样数量赋值
-//                        faiRecordData.setSamplingQty(qcFAIRecordData.getSamplingQty()); // 抽样数量
-//                    }
-//                    // 新增IQC明细记录信息
-//                    qcMapper.saveIQCDetailedRecord(faiRecordData);
-//                }
-//            }
-//            // 更新IQC主记录信息
-//            qcMapper.updateIQCRecord(qcFAIRecordData);
-//        }
         // 查询IQC主记录信息
         IPage<QcFAIRecordData> resultList = this.qcMapper.qcIQCInspectionSearch(new Page<QcFAIRecordData>(data.getPage(), data.getLimit()), data);
         return new PageUtils(resultList);
@@ -4014,11 +3645,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: iqc检验记录查询
-     * @author: fengyuan_yang
-     * @date: 2023/5/4 11:47
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcFAIRecordData>
+     * iqc检验记录查询
      **/
     @Override
     public List<QcFAIRecordData> iqcDetailSearch(QcFAIRecordData data) {
@@ -4027,11 +3654,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 查询IQC子明细记录
-     * @author: fengyuan_yang
-     * @date: 2023/5/4 13:11
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.SubDetailValues>
+     * 查询IQC子明细记录
      **/
     @Override
     public List<SubDetailValues> selectIQCSubDetailedRecord(SubDetailValues data) {
@@ -4040,11 +3663,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 检查子明细中的实测值是否在规定范围
-     * @author: fengyuan_yang
-     * @date: 2023/5/4 13:18
-     * @param: [data]
-     * @return: java.lang.Integer
+     * 检查子明细中的实测值是否在规定范围
      **/
     @Override
     public Integer checkIQCSubDetailValue(CheckSubDetailValueVo data) {
@@ -4059,11 +3678,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 新增明细信息
-     * @author: fengyuan_yang
-     * @date: 2023/5/4 13:27
-     * @param: [data]
-     * @return: void
+     * 新增明细信息
      **/
     @Override
     @Transactional
@@ -4140,11 +3755,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 保存批量合格信息
-     * @author: fengyuan_yang
-     * @date: 2023/5/4 13:27
-     * @param: [data]
-     * @return: void
+     * 保存批量合格信息
      **/
     @Override
     @Transactional
@@ -4301,11 +3912,7 @@ public class QcServiceImpl implements QcService {
 
 
     /**
-     * @description: 检查是否已提交
-     * @author: fengyuan_yang
-     * @date: 2023/5/4 14:00
-     * @param: [data]
-     * @return: java.lang.Integer
+     * 检查是否已提交
      **/
     @Override
     public Integer checkIQCIsSubmit(SubDetailValues data) {
@@ -4318,11 +3925,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 新增子明细信息
-     * @author: fengyuan_yang
-     * @date: 2023/5/4 15:55
-     * @param: [data]
-     * @return: void
+     * 新增子明细信息
      **/
     @Override
     @Transactional
@@ -4374,11 +3977,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 审核
-     * @author: fengyuan_yang
-     * @date: 2023/5/4 17:32
-     * @param: [data]
-     * @return: void
+     * 审核
      **/
     @Override
     @Transactional
@@ -4558,13 +4157,6 @@ public class QcServiceImpl implements QcService {
 
     }
 
-    /**
-     * @description:
-     * @author: fengyuan_yang
-     * @date: 2023/5/4 17:39
-     * @param: [data]
-     * @return: void
-     **/
     @Override
     @Transactional
     public void iqcRecordDelete(QcFAIRecordData data) {
@@ -4591,11 +4183,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 查询文件ID
-     * @author: fengyuan_yang
-     * @date: 2023/7/5 9:20
-     * @param: [data]
-     * @return: com.xujie.sys.modules.oss.entity.SysOssEntity
+     * 查询文件ID
      **/
     @Override
     public SysOssEntity queryFileId(SysOssEntity data) {
@@ -4607,11 +4195,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 获取工序列表
-     * @author: fengyuan_yang
-     * @date: 2023/7/7 15:40
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcPartAttributeData>
+     * 获取工序列表
      **/
     @Override
     public List<QcPartAttributeData> getOperationDescList(QcPartAttributeData data) {
@@ -4620,11 +4204,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 获取供应商列表
-     * @author: fengyuan_yang
-     * @date: 2023/7/9 22:34
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcPartAttributeData>
+     * 获取供应商列表
      **/
     @Override
     public List<QcPartAttributeData> getManufacturerList(QcPartAttributeData data) {
@@ -4633,11 +4213,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 获取所有机台
-     * @author: fengyuan_yang
-     * @date: 2023/9/15 11:37
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcFAIRecordData>
+     * 获取所有机台
      **/
     @Override
     public List<QcFAIRecordData> getAllResourceList(QcFAIRecordData data) {
@@ -4646,30 +4222,16 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 获取工单列表
-     * @author: fengyuan_yang
-     * @date: 2023/9/15 16:14
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcFAIRecordData>
+     * 获取工单列表
      **/
     @Override
     public List<QcFAIRecordData> getOrderNoList(QcFAIRecordData data) {
         List<QcFAIRecordData> resultList = this.qcMapper.getOrderNoList(data);
-//        // 去重
-//        List<QcFAIRecordData> collect = resultList.getRecords().stream().collect(
-//                Collectors.collectingAndThen(
-//                        Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(QcFAIRecordData::getOrderNo))), ArrayList::new
-//                ));
-//        resultList.setRecords(collect);
         return resultList;
     }
 
     /**
-     * @description: 获取物料其它信息
-     * @author: fengyuan_yang
-     * @date: 2023/10/20 15:19
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcFAIRecordData>
+     * 获取物料其它信息
      **/
     @Override
     public List<QcFAIRecordData> getPartInformation(QcFAIRecordData data) {
@@ -4678,11 +4240,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 获取特殊工序列表
-     * @author: fengyuan_yang
-     * @date: 2023/10/20 15:31
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcFAIRecordData>
+     * 获取特殊工序列表
      **/
     @Override
     public List<QcFAIRecordData> getSpecialOperationList(QcFAIRecordData data) {
@@ -4698,11 +4256,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 获取处置措施列表
-     * @author: fengyuan_yang
-     * @date: 2023/10/23 13:15
-     * @param: []
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcFAIRecordData>
+     * 获取处置措施列表
      **/
     @Override
     public List<QcFAIRecordData> disposalMeasuresSearch(QcFAIRecordData data) {
@@ -4711,11 +4265,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 查询文件路径
-     * @author: fengyuan_yang
-     * @date: 2023/11/1 16:50
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.oss.entity.SysOssEntity>
+     * 查询文件路径
      **/
     @Override
     public List<SysOssEntity> searchItemFileUrl(QcFAIRecordData data) {
@@ -4729,11 +4279,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 删除图片
-     * @author: fengyuan_yang
-     * @date: 2023/11/1 16:53
-     * @param: [data]
-     * @return: void
+     * 删除图片
      **/
     @Override
     public void imageDelete(SysOssEntity data) {
@@ -4741,11 +4287,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 模糊查询标签号
-     * @author: fengyuan_yang
-     * @date: 2023/11/3 16:50
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcFAIRecordData>
+     * 模糊查询标签号
      **/
     @Override
     public List<QcFAIRecordData> getRollNo(QcFAIRecordData data) {
@@ -4754,11 +4296,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 标签号回车事件
-     * @author: fengyuan_yang
-     * @date: 2023/11/7 10:24
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcFAIRecordData>
+     * 标签号回车事件
      **/
     @Override
     public List<QcFAIRecordData> rollNoEnter(QcFAIRecordData data) {
@@ -4793,11 +4331,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 查询物料集合
-     * @author: fengyuan_yang
-     * @date: 2023/11/7 14:48
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcFAIRecordData>
+     * 查询物料集合
      **/
     @Override
     public List<QcFAIRecordData> queryPartList(QcFAIRecordData data) {
@@ -4813,11 +4347,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: 查询单位列表
-     * @author: fengyuan_yang
-     * @date: 2023/11/8 9:28
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcFAIRecordData>
+     * 查询单位列表
      **/
     @Override
     public List<QcFAIRecordData> umSearch(QcFAIRecordData data) {
@@ -4951,9 +4481,6 @@ public class QcServiceImpl implements QcService {
 
     /**
      * 文件上传
-     * @param file
-     * @param inData
-     * @return
      */
     @Override
     public SysOssEntity upload(MultipartFile file, GetParamInData inData) {
@@ -5033,7 +4560,6 @@ public class QcServiceImpl implements QcService {
 
     /**
      * 获取采购类型
-     * @return
      */
     @Override
     public List<QcFAIRecordData> orderTypeSearch() {
@@ -5043,7 +4569,6 @@ public class QcServiceImpl implements QcService {
 
     /**
      * 开始检验
-     * @param data
      */
     @Override
     @Transactional
@@ -5054,7 +4579,6 @@ public class QcServiceImpl implements QcService {
 
     /**
      * 开始检验
-     * @param data
      */
     @Override
     @Transactional
@@ -5065,7 +4589,6 @@ public class QcServiceImpl implements QcService {
 
     /**
      * 开始检验
-     * @param data
      */
     @Override
     @Transactional
@@ -5076,7 +4599,6 @@ public class QcServiceImpl implements QcService {
 
     /**
      * 开始检验
-     * @param data
      */
     @Override
     @Transactional
@@ -5087,7 +4609,6 @@ public class QcServiceImpl implements QcService {
 
     /**
      * 数据采集
-     * @param data
      */
     @Override
     @Transactional
@@ -5296,7 +4817,6 @@ public class QcServiceImpl implements QcService {
 
     /**
      * 开始检验
-     * @param data
      */
     @Override
     @Transactional
@@ -5306,11 +4826,7 @@ public class QcServiceImpl implements QcService {
     }
 
     /**
-     * @description: fqas检验记录查询
-     * @author: fengyuan_yang
-     * @date: 2023/5/4 11:47
-     * @param: [data]
-     * @return: java.util.List<com.xujie.sys.modules.pms.data.QcFAIRecordData>
+     * fqas检验记录查询
      **/
     @Override
     public List<QcFAIRecordData> fqasDetailSearch(QcFAIRecordData data) {
@@ -5320,8 +4836,6 @@ public class QcServiceImpl implements QcService {
 
     /**
      * 查询FQAS子明细记录
-     * @param data
-     * @return
      */
     @Override
     public List<SubDetailValues> selectFQASSubDetailedRecord(SubDetailValues data) {
@@ -5331,8 +4845,6 @@ public class QcServiceImpl implements QcService {
 
     /**
      * 新增子明细信息
-     * @param data
-     * @return
      */
     @Override
     @Transactional
@@ -5385,8 +4897,6 @@ public class QcServiceImpl implements QcService {
 
     /**
      * 检查是否已提交
-     * @param data
-     * @return
      */
     @Override
     public Integer checkFQASIsSubmit(SubDetailValues data) {
@@ -5400,7 +4910,6 @@ public class QcServiceImpl implements QcService {
 
     /**
      * 新增明细信息
-     * @param data
      */
     @Override
     @Transactional
@@ -5480,7 +4989,6 @@ public class QcServiceImpl implements QcService {
 
     /**
      * 审核
-     * @param data
      */
     @Override
     @Transactional
@@ -5533,7 +5041,6 @@ public class QcServiceImpl implements QcService {
 
     /**
      * 删除检验记录
-     * @param data
      */
     @Override
     @Transactional
@@ -5562,7 +5069,6 @@ public class QcServiceImpl implements QcService {
 
     /**
      * 任务重载
-     * @param data
      */
     @Override
     @Transactional
@@ -5683,7 +5189,6 @@ public class QcServiceImpl implements QcService {
 
     /**
      * 更改检验方式
-     * @param data
      */
     @Override
     @Transactional
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/QcService.java b/src/main/java/com/xujie/sys/modules/pms/service/QcService.java
index 8cb0190..9cde089 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/QcService.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/QcService.java
@@ -322,4 +322,8 @@ public interface QcService {
     PageUtils searchSeqInfo2(QcFAIRecordData data);
 
     List<ShiftData> getShiftList(ShiftData data);
+
+    void batchSaveOsInspection(QcFAIRecordData data);
+
+    void ipqcRecordOverLoad(QcFAIRecordData data);
 }
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index 8cf8a49..cef73fd 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -1894,8 +1894,27 @@
 
     <!-- 新增IPQC明细记录信息 -->
     <insert id="saveIPQCDetailedRecord" parameterType="QcFAIRecordData">
-        INSERT INTO qc_ipqc_detailed_record (inspection_no, order_no, template_id, sampling_level_no, sampling_level_desc, sampling_programme_no, sampling_programme_desc, AQL, AC, RE, item_no, item_desc, object_id, object_desc, default_value, min_value, max_value, value_type_db, value_type, site, sampling_qty, bu_no, serial_no)
-        VALUES(#{inspectionNo}, #{orderNo}, #{templateId}, #{samplingLevelNo}, #{samplingLevelDesc}, #{samplingProgrammeNo}, #{samplingProgrammeDesc}, #{aql,jdbcType=DECIMAL}, #{ac,jdbcType=DECIMAL}, #{re,jdbcType=DECIMAL}, #{itemNo}, #{itemDesc}, #{objectId}, #{objectDesc}, #{defaultValue}, #{minValue,jdbcType=DECIMAL}, #{maxValue,jdbcType=DECIMAL}, #{valueTypeDb}, #{valueType}, #{site}, #{samplingQty,jdbcType=DECIMAL}, #{buNo}, #{serialNo})
+        INSERT INTO qc_ipqc_detailed_record
+        (inspection_no, order_no, template_id, sampling_level_no, sampling_level_desc, sampling_programme_no, sampling_programme_desc,
+         AQL, AC, RE, item_no, item_desc, object_id, object_desc, default_value, min_value, max_value,
+         value_type_db, value_type, site, sampling_qty, bu_no, serial_no)
+        VALUES
+        (#{inspectionNo}, #{orderNo}, #{templateId}, #{samplingLevelNo}, #{samplingLevelDesc}, #{samplingProgrammeNo}, #{samplingProgrammeDesc},
+         #{aql,jdbcType=DECIMAL}, #{ac,jdbcType=DECIMAL}, #{re,jdbcType=DECIMAL}, #{itemNo}, #{itemDesc}, #{objectId}, #{objectDesc}, #{defaultValue}, #{minValue,jdbcType=DECIMAL}, #{maxValue,jdbcType=DECIMAL},
+         #{valueTypeDb}, #{valueType}, #{site}, #{samplingQty,jdbcType=DECIMAL}, #{buNo}, #{serialNo})
+    </insert>
+
+    <insert id="saveIPQCDetailedRecords">
+        INSERT INTO qc_ipqc_detailed_record
+        (inspection_no, order_no, template_id, sampling_level_no, sampling_level_desc, sampling_programme_no, sampling_programme_desc,
+        AQL, AC, RE, item_no, item_desc, object_id, object_desc, default_value, min_value, max_value,
+        value_type_db, value_type, site, sampling_qty, bu_no, serial_no)
+        VALUES
+        <foreach collection="list" item="item" separator=",">
+            (#{item.inspectionNo}, #{item.orderNo}, #{item.templateId}, #{item.samplingLevelNo}, #{item.samplingLevelDesc}, #{item.samplingProgrammeNo}, #{item.samplingProgrammeDesc},
+            #{item.aql,jdbcType=DECIMAL}, #{item.ac,jdbcType=DECIMAL}, #{item.re,jdbcType=DECIMAL}, #{item.itemNo}, #{item.itemDesc}, #{item.objectId}, #{item.objectDesc}, #{item.defaultValue}, #{item.minValue,jdbcType=DECIMAL}, #{item.maxValue,jdbcType=DECIMAL},
+            #{item.valueTypeDb}, #{item.valueType}, #{item.site}, #{item.samplingQty,jdbcType=DECIMAL}, #{item.buNo}, #{item.serialNo})
+        </foreach>
     </insert>
 
     <!-- 新增IPQC记录到count表 -->
@@ -4484,6 +4503,25 @@
         FROM calendar_datetype_shift
         WHERE site = #{site}
     </select>
+
+    <select id="getIPQCDetailInfo" resultType="com.xujie.sys.modules.pms.data.QcDetailInformationData">
+        SELECT
+            site,
+            bu_no,
+            inspection_no,
+            template_id
+        FROM qc_ipqc_detailed_record
+        where site = #{site} and bu_no = #{buNo} and inspection_no = #{inspectionNo}
+    </select>
+
+    <update id="updateIPQCRecord" parameterType="com.xujie.sys.modules.pms.data.QcFAIRecordData">
+        UPDATE qc_ipqc_record
+        SET sampling_qty = #{samplingQty},
+            inspection_cycle = #{inspectionCycle},
+            pass_qty = #{samplingQty},
+            not_pass_qty = 0
+        WHERE site = #{site} and bu_no = #{buNo} and inspection_no = #{inspectionNo}
+    </update>
 </mapper>