diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java
index c81f2d18..78e96367 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java
@@ -174,6 +174,19 @@ public class QuaController extends BaseController {
         }
         return success(qcProCheckService.getCheckTaskDetailList(qcCheckTaskDetail));
     }
+    /**
+     * 获取回显
+     */
+    @GetMapping(value = "getCheckTaskDetailListCg")
+    public AjaxResult getCheckTaskDetailListCg(QcCheckTaskDetail qcCheckTaskDetail) {
+        if(StringUtils.isBlank(qcCheckTaskDetail.getFactoryCode())){
+            return error("[factoryCode]不能为空");
+        }
+        if(StringUtils.isBlank(qcCheckTaskDetail.getBelongTo())){
+            return error("[belongTo]不能为空");
+        }
+        return success(qcProCheckService.getCheckTaskDetailListCg(qcCheckTaskDetail));
+    }
     /**
      * 自动取称的数据
      */
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java
index b6503405..4078474e 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java
@@ -47,6 +47,8 @@ public interface QcCheckTaskIncomeMapper {
      */
     public int insertQcCheckTaskIncome(QcCheckTaskIncome qcCheckTaskIncome);
 
+    int insertQcCheckTaskIncomeCg(QcCheckTaskIncome qcCheckTaskIncome);
+
     /**
      * 修改来料检验
      *
@@ -82,6 +84,9 @@ public interface QcCheckTaskIncomeMapper {
     List<QcCheckTaskDetail> getCkeckProjectList(QcCheckTaskDetail qcCheckTaskDetail);
 
     int updateQcCheckTask(QcCheckTaskIncome qcCheckTask);
+    int updateQcCheckTaskCg(QcCheckTaskIncome qcCheckTask);
+
+    List<QcCheckTaskIncome> selectQcCheckTaskCgByRecordId(String recordId);
 
     int updateQcCheckTaskDetails(@Param("list") List<QcCheckTaskDetail> details);
 
@@ -107,6 +112,8 @@ public interface QcCheckTaskIncomeMapper {
 
     QcCheckTaskIncome getTaskInfo(String recordId);
 
+    QcCheckTaskIncome getTaskInfoCg(String recordId);
+
     int deleteQcCheckTaskDefects(String belongId);
 
     List<QcCheckTaskIncome> getCkeckTaskXJList(QcCheckTaskIncome qcCheckTaskIncome);
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/QcProCheckService.java b/op-modules/op-quality/src/main/java/com/op/quality/service/QcProCheckService.java
index dbdd5159..2b3c538e 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/QcProCheckService.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/QcProCheckService.java
@@ -47,4 +47,6 @@ public interface QcProCheckService {
     String getWeightInfo(QcCheckTaskDetail qcCheckTaskDetail);
 
     QcCheckTaskDetail getAutoJudge(QcCheckTaskDetail qcCheckTaskDetail);
+
+    QcCheckTaskIncome getCheckTaskDetailListCg(QcCheckTaskDetail qcCheckTaskDetail);
 }
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
index bc79d244..f38bbbfb 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java
@@ -432,7 +432,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 				detail.setFileUrls(urls);
 			}
 		}
-		 return dtos;
+		return dtos;
 	}
 
 	@Override
@@ -610,7 +610,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 	public List<QcCheckTaskIncome> getCkeckProjectXJList(QcCheckTaskIncome qcCheckTaskIncome) {
 		List<QcCheckTaskIncome> dtos = qcCheckTaskIncomeMapper.getCkeckTaskXJList(qcCheckTaskIncome);
         for(QcCheckTaskIncome dto:dtos){
-        	//不良分类
+			//不良分类
 			QcCheckTaskDefect defectqo = new QcCheckTaskDefect();
 			defectqo.setBelongTo(dto.getRecordId());
 			List<QcCheckTaskDefect> defects = qcCheckTaskDefectMapper.selectQcCheckTaskDefectList(defectqo);
@@ -690,8 +690,58 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 		qcCheckTask.setSampleQuality(qcCheckTaskIncome.getSampleQuality());
 		qcCheckTask.setReason(qcCheckTaskIncome.getReason());
 		qcCheckTask.setBz(qcCheckTaskIncome.getAttr3());//备注
+
+		qcCheckTask.setStartOA(qcCheckTaskIncome.getStartOA());
+		qcCheckTask.setTypeCode(qcCheckTaskIncome.getTypeCode());
+
+
+		/* 来料草稿 */
+		qcCheckTask.setOaFactory(qcCheckTaskIncome.getOaFactory());
+		qcCheckTask.setSupplierCode(qcCheckTaskIncome.getSupplierCode());
+		qcCheckTask.setSupplierName(qcCheckTaskIncome.getSupplierName());
+		qcCheckTask.setCzbjr(qcCheckTaskIncome.getCzbjr());
+		qcCheckTask.setZcf(qcCheckTaskIncome.getZcf());
+		qcCheckTask.setZcoemcm(qcCheckTaskIncome.getZcoemcm());
+		qcCheckTask.setQczg(qcCheckTaskIncome.getQczg());
+		qcCheckTask.setQuality(qcCheckTaskIncome.getQuality());
+		qcCheckTask.setUnit(qcCheckTaskIncome.getUnit());
+		qcCheckTask.setMaterialType(qcCheckTaskIncome.getMaterialType());
+		qcCheckTask.setMaterialFrom(qcCheckTaskIncome.getMaterialFrom());
+
+		/* 巡检草稿 */
+		qcCheckTask.setSqbm(qcCheckTaskIncome.getSqbm());// 所属部门
+		qcCheckTask.setCheckLoc(qcCheckTaskIncome.getCheckLoc()); // 发现地点
+		qcCheckTask.setOaFactoryF(qcCheckTaskIncome.getOaFactoryF());// 异常范围
+		qcCheckTask.setSfxyzg(qcCheckTaskIncome.getSfxyzg());// 是否需要主管审核
+		qcCheckTask.setPgzg(qcCheckTaskIncome.getPgzg());// QC主管
+		qcCheckTask.setPgzr(qcCheckTask.getPgzr()); // 质量主管
+		qcCheckTask.setSfgyswt(qcCheckTaskIncome.getSfgyswt());// 是否供应商
+		qcCheckTask.setSccj(qcCheckTaskIncome.getSccj());// 所属车间
+		qcCheckTask.setSqr(qcCheckTaskIncome.getSqr());// 申请人Id
+
 		/**qc_check_task_cg**/
-		n = qcCheckTaskIncomeMapper.updateQcCheckTask(qcCheckTask);//updateQcCheckTaskCG
+		List<QcCheckTaskIncome> valiData = qcCheckTaskIncomeMapper.selectQcCheckTaskCgByRecordId(belongId);
+		// 判断表中是否存在此条数据
+		if (valiData != null && valiData.size() > 0) {
+			n = qcCheckTaskIncomeMapper.updateQcCheckTaskCg(qcCheckTask);//updateQcCheckTaskCG
+		}else {
+			qcCheckTask.setCheckNo(qcCheckTaskIncome.getCheckNo());
+			qcCheckTask.setOrderNo(qcCheckTaskIncome.getOrderNo());
+			qcCheckTask.setMaterialCode(qcCheckTaskIncome.getMaterialCode());
+			qcCheckTask.setMaterialName(qcCheckTaskIncome.getMaterialName());
+			qcCheckTask.setOrderType(qcCheckTaskIncome.getOrderType());
+			qcCheckTask.setOrderTypeDesc(qcCheckTaskIncome.getOrderTypeDesc());
+			qcCheckTask.setCreateBy(qcCheckTaskIncome.getCreateBy());
+			qcCheckTask.setCreateTime(DateUtils.getNowDate());
+			qcCheckTask.setFactoryCode(qcCheckTaskIncome.getFactoryCode());
+			qcCheckTask.setCheckType(qcCheckTaskIncome.getCheckType());
+
+			qcCheckTask.setaNoOkquality(qcCheckTaskIncome.getaNoOkquality());
+			qcCheckTask.setbNoOkquality(qcCheckTaskIncome.getbNoOkquality());
+			qcCheckTask.setcNoOkquality(qcCheckTaskIncome.getcNoOkquality());
+
+			n = qcCheckTaskIncomeMapper.insertQcCheckTaskIncomeCg(qcCheckTask);
+		}
 		logger.info("qc_check_task:"+n);
 		/**更新qc_check_task_detail**/
 		for(QcCheckTaskDetail detail:details){
@@ -921,7 +971,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 		return 1 ;
 	}
 
-	 /* 首检巡检都是品质异常流程
+	/* 首检巡检都是品质异常流程
 	 * 成品的是成品检验控制流程
 	 * 来料的是来料检验不合格流程*/
 	private void setOaFunc(QcCheckUnqualified unqualified,QcCheckTaskIncome qcCheckTaskIncome){
@@ -1052,6 +1102,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 			//发企业微信--------------------结束
 		}
 	}
+
 	//CAR:0 PC:1 其它：2 吨：3 千克：4
 	protected String getConvertUnit(String unit){
 		String unitOa= "";
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java
index 8fe9c061..9fbffd84 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java
@@ -173,6 +173,40 @@ public class QcProCheckServiceImpl implements QcProCheckService {
 
         return dto;
     }
+    @Override
+    public QcCheckTaskIncome getCheckTaskDetailListCg(QcCheckTaskDetail qcCheckTaskDetail) {
+        DynamicDataSourceContextHolder.push(qcCheckTaskDetail.getFactoryCode());
+        QcCheckTaskIncome dto = qcCheckTaskIncomeMapper.getTaskInfoCg(qcCheckTaskDetail.getBelongTo());
+        if (dto == null) {
+            return null;
+        }
+        List<QcCheckTaskDetail> qcCheckTaskDetails = qcCheckTaskIncomeMapper.getCkeckProjectList(qcCheckTaskDetail);
+        /**qc_check_task_defect**/
+        Map<String,QcCheckTaskDefect> defectMap = qcCheckTaskDefectMapper.getDefectMap(qcCheckTaskDetail);
+
+        for (QcCheckTaskDetail qcd : qcCheckTaskDetails) {
+            List<BaseFile> files = qmsFileMapper.getBaseFileBatch(qcd.getRecordId());
+            if (CollectionUtils.isNotEmpty(files)) {
+                qcd.setFiles(files);
+            }
+
+            QcCheckTaskDefect defectInfo = defectMap.get(qcd.getRecordId());
+            if(defectInfo != null){
+                qcd.setDefectCodes(defectInfo.getDefectCodes());
+                qcd.setDefectNames(defectInfo.getDefectNames());
+                qcd.setDefectQualitys(defectInfo.getDefectQualitys());
+            }
+        }
+
+        dto.setQcCheckTaskDetails(qcCheckTaskDetails);
+        List<QcCheckTaskDefect> defects = qcCheckTaskIncomeMapper.getCkeckDefectList(qcCheckTaskDetail);
+        if (CollectionUtils.isEmpty(defects)) {
+            defects = qcCheckTaskIncomeMapper.getDefectType(qcCheckTaskDetail);
+        }
+        dto.setDefects(defects);
+
+        return dto;
+    }
 
     @Override
     @DS("master")
diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml
index a363ca2d..4159ccc0 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml
@@ -320,6 +320,178 @@
         update_time = #{updateTime}
         where record_id = #{recordId}
     </update>
+
+    <insert id="insertQcCheckTaskIncomeCg" parameterType="QcCheckTaskIncome">
+        insert into qc_check_task_cg
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="recordId != null">record_id,</if>
+            <if test="checkNo != null">check_no,</if>
+            <if test="incomeBatchNo != null">income_batch_no,</if>
+            <if test="orderNo != null">order_no,</if>
+            <if test="materialCode != null">material_code,</if>
+            <if test="materialName != null">material_name,</if>
+            <if test="quality != null">quality,</if>
+            <if test="noOkQuality != null">noOk_quality,</if>
+            <if test="unit != null">unit,</if>
+            <if test="supplierCode != null">supplier_code,</if>
+            <if test="supplierName != null">supplier_name,</if>
+            <if test="incomeTime != null">income_time,</if>
+            <if test="checkLoc != null">check_loc,</if>
+            <if test="checkStatus != null">check_status,</if>
+            <if test="checkManCode != null">check_man_code,</if>
+            <if test="checkManName != null">check_man_name,</if>
+            <if test="checkTime != null">check_time,</if>
+            <if test="checkResult != null">check_result,</if>
+            <if test="status != null">status,</if>
+            <if test="attr1 != null">attr1,</if>
+            <if test="attr2 != null">attr2,</if>
+            <if test="attr3 != null">attr3,</if>
+            <if test="attr4 != null">attr4,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="factoryCode != null and factoryCode != ''">factory_code,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="checkType != null">check_type,</if>
+            <if test="typeCode != null">type_code,</if>
+            <if test="sampleQuality != null">sample_quality,</if>
+            <if test="orderType != null">order_type,</if>
+            <if test="orderTypeDesc != null">order_type_desc,</if>
+            <if test="remark != null">remark,</if>
+            <if test="reason != null">reason,</if>
+            <if test="bz != null">bz,</if>
+            <if test="startOA != null">start_oA,</if>
+            <if test="oaFactory != null">oa_factory,</if>
+            <if test="materialType != null">material_type,</if>
+            <if test="materialFrom != null">material_from,</if>
+            <if test="czbjr != null">czbjr,</if>
+            <if test="zcf != null">zcf,</if>
+            <if test="zcoemcm != null">zcoemcm,</if>
+            <if test="qczg != null">qczg,</if>
+            <if test="sqr != null">sqr,</if>
+            <if test="sqbm != null">sqbm,</if>
+            <if test="oaFactoryF != null">oa_factory_f,</if>
+            <if test="sfxyzg != null">sfxyzg,</if>
+            <if test="pgzg != null">pgzg,</if>
+            <if test="pgzr != null">pgzr,</if>
+            <if test="sfgyswt != null">sfgyswt,</if>
+            <if test="sccj != null">sccj,</if>
+            <if test="aNoOkquality != null">aNoOkquality,</if>
+            <if test="bNoOkquality != null">bNoOkquality,</if>
+            <if test="cNoOkquality != null">cNoOkquality,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="recordId != null">#{recordId},</if>
+            <if test="checkNo != null">#{checkNo},</if>
+            <if test="incomeBatchNo != null">#{incomeBatchNo},</if>
+            <if test="orderNo != null">#{orderNo},</if>
+            <if test="materialCode != null">#{materialCode},</if>
+            <if test="materialName != null">#{materialName},</if>
+            <if test="quality != null">#{quality},</if>
+            <if test="noOkQuality != null">#{noOkQuality},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="supplierCode != null">#{supplierCode},</if>
+            <if test="supplierName != null">#{supplierName},</if>
+            <if test="incomeTime != null">#{incomeTime},</if>
+            <if test="checkLoc != null">#{checkLoc},</if>
+            <if test="checkStatus != null">#{checkStatus},</if>
+            <if test="checkManCode != null">#{checkManCode},</if>
+            <if test="checkManName != null">#{checkManName},</if>
+            <if test="checkTime != null">#{checkTime},</if>
+            <if test="checkResult != null">#{checkResult},</if>
+            <if test="status != null">#{status},</if>
+            <if test="attr1 != null">#{attr1},</if>
+            <if test="attr2 != null">#{attr2},</if>
+            <if test="attr3 != null">#{attr3},</if>
+            <if test="attr4 != null">#{attr4},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="factoryCode != null and factoryCode != ''">#{factoryCode},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="checkType != null">#{checkType},</if>
+            <if test="typeCode != null">#{typeCode},</if>
+            <if test="sampleQuality != null">#{sampleQuality},</if>
+            <if test="orderType != null">#{orderType},</if>
+            <if test="orderTypeDesc != null">#{orderTypeDesc},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="reason != null">#{reason},</if>
+            <if test="bz != null">#{bz},</if>
+            <if test="startOA != null">#{startOA},</if>
+            <if test="oaFactory != null">#{oaFactory},</if>
+            <if test="materialType != null">#{materialType},</if>
+            <if test="materialFrom != null">#{materialFrom},</if>
+            <if test="czbjr != null">#{czbjr},</if>
+            <if test="zcf != null">#{zcf},</if>
+            <if test="zcoemcm != null">#{zcoemcm},</if>
+            <if test="qczg != null">#{qczg},</if>
+            <if test="sqr != null">#{sqr},</if>
+            <if test="sqbm != null">#{sqbm},</if>
+            <if test="oaFactoryF != null">#{oaFactoryF},</if>
+            <if test="sfxyzg != null">#{sfxyzg},</if>
+            <if test="pgzg != null">#{pgzg},</if>
+            <if test="pgzr != null">#{pgzr},</if>
+            <if test="sfgyswt != null">#{sfgyswt},</if>
+            <if test="sccj != null">#{sccj},</if>
+            <if test="aNoOkquality != null">#{aNoOkquality},</if>
+            <if test="bNoOkquality != null">#{bNoOkquality},</if>
+            <if test="cNoOkquality != null">#{cNoOkquality},</if>
+        </trim>
+    </insert>
+
+    <update id="updateQcCheckTaskCg">
+        update qc_check_task_cg
+        set
+        check_status = #{checkStatus},
+        check_man_code = #{checkManCode},
+        check_man_name =#{checkManName},
+        <if test="checkTime != null">check_time = #{checkTime},</if>
+        <if test="sampleQuality != null">sample_quality = #{sampleQuality},</if>
+        <if test="noOkQuality != null">noOk_quality = #{noOkQuality},</if>
+        <if test="aNoOkquality != null">aNoOkquality = #{aNoOkquality},</if>
+        <if test="bNoOkquality != null">bNoOkquality = #{bNoOkquality},</if>
+        <if test="cNoOkquality != null">cNoOkquality = #{cNoOkquality},</if>
+        <if test="incomeBatchNo != null">income_batch_no = #{incomeBatchNo},</if>
+        <if test="remark != null">remark = #{remark},</if>
+        <if test="reason != null">reason = #{reason},</if>
+        <if test="bz != null">bz = #{bz},</if>
+        <if test="startOA != null">start_oA = #{startOA},</if>
+        <if test="oaFactory != null">oa_factory = #{oaFactory},</if>
+        <if test="materialType != null">material_type = #{materialType},</if>
+        <if test="materialFrom != null">material_from = #{materialFrom},</if>
+        <if test="czbjr != null">czbjr = #{czbjr},</if>
+        <if test="zcf != null">zcf = #{zcf},</if>
+        <if test="zcoemcm != null">zcoemcm = #{zcoemcm},</if>
+        <if test="qczg != null">qczg = #{qczg},</if>
+        <if test="sqr != null">sqr = #{sqr},</if>
+        <if test="quality != null">quality = #{quality},</if>
+        <if test="unit != null">unit = #{unit},</if>
+        <if test="sqbm != null">sqbm = #{sqbm},</if>
+        <if test="checkLoc != null">check_loc = #{checkLoc},</if>
+        <if test="oaFactoryF != null">oa_factory_f = #{oaFactoryF},</if>
+        <if test="sfxyzg != null">sfxyzg = #{sfxyzg},</if>
+        <if test="pgzg != null">pgzg = #{pgzg},</if>
+        <if test="pgzr != null">pgzr = #{pgzr},</if>
+        <if test="sfgyswt != null">sfgyswt = #{sfgyswt},</if>
+        <if test="sccj != null">sccj = #{sccj},</if>
+        check_result = #{checkResult},
+        update_by = #{updateBy},
+        update_time = #{updateTime}
+        where record_id = #{recordId}
+    </update>
+    <select id="selectQcCheckTaskCgByRecordId" resultType="com.op.quality.domain.QcCheckTaskIncome">
+        select record_id, check_no, income_batch_no, order_no, material_code, material_name, quality, unit,
+               supplier_code, supplier_name, income_time, check_loc, check_status, check_man_code,
+               check_man_name, check_time, check_result, status, attr1, attr2, attr3, attr4, create_by,
+               create_time, update_by, update_time, factory_code, del_flag , check_type,sample_quality, noOk_quality,
+               order_type,order_type_desc
+        from qc_check_task_cg
+        where record_id = #{recordId}
+    </select>
+
+
     <update id="updateQcCheckTaskDetails">
         <foreach collection="list" item="item" separator=";">
             update qc_check_task_detail
@@ -421,6 +593,48 @@
 		left join pro_order_workorder pow on pow.workorder_code = qct.order_no and pow.del_flag = '0'
 		where qct.record_id = #{recordId}
 	</select>
+    <select id="getTaskInfoCg" resultType="com.op.quality.domain.QcCheckTaskIncome">
+        select
+            qct.material_code materialCode,
+            qct.material_name materialName,
+            qct.supplier_code supplierCode,
+            qct.supplier_name supplierName,
+            qct.income_batch_no incomeBatchNo,
+            qct.quality,
+            qct.material_type materialType,
+            qct.material_from materialFrom,
+            qct.factory_code factoryCode,
+            case when pow.workorder_code_sap is not null then pow.workorder_code_sap
+                 else qct.order_no end orderNo,
+            qct.create_time createTime,
+            qct.check_no checkNo,
+            qct.type_code typeCode,
+            qct.unit,
+            qct.check_time checkTime,
+            qct.check_result checkResult,
+            qct.income_time incomeTime,
+            qct.check_loc checkLoc,
+            qct.remark,
+            qct.czbjr,
+            qct.zcf,
+            qct.zcoemcm,
+            qct.qczg,
+            qct.reason,
+            qct.bz attr3,
+            qct.check_type checkType,
+            qct.sample_quality sampleQuality,
+            qct.oa_factory_f oaFactoryF,
+            qct.start_oA startOA,
+            qct.sqbm,
+            qct.sqr,
+            qct.sfxyzg,
+            qct.sfgyswt,
+            qct.sccj
+        from qc_check_task_cg qct
+                 left join pro_order_workorder pow on pow.workorder_code = qct.order_no and pow.del_flag = '0'
+        where qct.record_id = #{recordId}
+    </select>
+
     <select id="getCkeckTaskXJList" resultType="com.op.quality.domain.QcCheckTaskIncome">
 		select
 			   record_id recordId,