diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml
index 6656b442..38a294a9 100644
--- a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml
+++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml
@@ -118,9 +118,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  equ.equipment_type_code
     </select>
     <select id="getBoardFactory" resultType="com.op.system.api.domain.SysDept">
-        select dept_id parentName,
-               dept_name deptName
-        from sys_dept where parent_id  = '1' and del_flag = '0'
+        select SUBSTRING(pool_name, 4, 6) parentName,
+               park_name deptName
+        from sys_datasource where del_flag = '0' and status = '0'
     </select>
     <select id="getTotalNumL" resultType="com.op.system.api.domain.dto.BoardDTO">
         select count(0) totalNum,
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProduceController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProduceController.java
index 1cd85fcf..aa9aafc6 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProduceController.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProduceController.java
@@ -9,10 +9,7 @@ import com.op.common.log.annotation.Log;
 import com.op.common.log.enums.BusinessType;
 import com.op.common.security.annotation.RequiresPermissions;
 import com.op.common.security.utils.SecurityUtils;
-import com.op.quality.domain.QcBomComponent;
-import com.op.quality.domain.QcCheckReportIncome;
-import com.op.quality.domain.QcCheckTaskDetail;
-import com.op.quality.domain.QcSupplier;
+import com.op.quality.domain.*;
 import com.op.quality.service.IQcCheckReportProduceService;
 import com.op.system.api.domain.SysUser;
 import org.apache.commons.lang.StringUtils;
@@ -177,4 +174,11 @@ public class QcCheckReportProduceController extends BaseController {
 		List<QcCheckTaskDetail> list = qcCheckReportProduceService.getCkeckProjectList(qcCheckTaskDetail);
 		return getDataTable(list);
 	}
+
+    /**巡检报表数据**/
+	@PostMapping("/getProduceReportXJ")
+	public QcCheckTaskProduce getProduceReportXJ(@RequestBody QcCheckTaskProduce qcCheckTaskProduce) {
+		QcCheckTaskProduce dto = qcCheckReportProduceService.getProduceReportXJ(qcCheckTaskProduce);
+		return dto;
+	}
 }
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckReportIncome.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckReportIncome.java
index 759f4db9..b117e65e 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckReportIncome.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckReportIncome.java
@@ -125,6 +125,15 @@ public class QcCheckReportIncome extends BaseEntity {
 	private String typeCode;//大类
 	private String checkType;//小类
 	private String checkName;
+	private String createTimeStr;
+
+	public String getCreateTimeStr() {
+		return createTimeStr;
+	}
+
+	public void setCreateTimeStr(String createTimeStr) {
+		this.createTimeStr = createTimeStr;
+	}
 
 	public String getCheckName() {
 		return checkName;
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java
index 6db2aca5..324b3107 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskProduce.java
@@ -2,6 +2,8 @@ package com.op.quality.domain;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -129,6 +131,7 @@ public class QcCheckTaskProduce extends BaseEntity {
 	private String checkType;
 	private String workorderCode;
 	private String orderType;
+	private String lineName;
 
 	@Excel(name = "抽样数量")
 	private BigDecimal sampleQuality;
@@ -145,6 +148,23 @@ public class QcCheckTaskProduce extends BaseEntity {
 	@Excel(name = "C类不合格数量")
 	private BigDecimal cNoOkquality;
 	private String checkName;
+	private List<QcStaticTable> checkInfos;
+
+	public List<QcStaticTable> getCheckInfos() {
+		return checkInfos;
+	}
+
+	public void setCheckInfos(List<QcStaticTable> checkInfos) {
+		this.checkInfos = checkInfos;
+	}
+
+	public String getLineName() {
+		return lineName;
+	}
+
+	public void setLineName(String lineName) {
+		this.lineName = lineName;
+	}
 
 	public String getCheckName() {
 		return checkName;
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java
index ec72b606..f70f798a 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java
@@ -71,4 +71,6 @@ public interface QcCheckReportIncomeMapper {
 	int getTodayMaxNum(QcCheckReportIncome qcCheckReportIncome);
 
 	List<QcCheckTaskDetail> getCkeckProjectList(QcCheckTaskDetail qcCheckTaskDetail);
+
+    QcCheckTaskProduce getTopInfo(QcCheckTaskProduce qcCheckTaskProduce);
 }
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskProduceMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskProduceMapper.java
index 4fb4a4af..6df8b901 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskProduceMapper.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskProduceMapper.java
@@ -2,6 +2,7 @@ package com.op.quality.mapper;
 
 import java.util.List;
 
+import com.op.quality.domain.QcCheckReportIncome;
 import com.op.quality.domain.QcCheckTaskProduce;
 import com.op.quality.domain.QcCheckType;
 import com.op.system.api.domain.mes.ProOrderWorkorderDTO;
@@ -73,4 +74,12 @@ public interface QcCheckTaskProduceMapper {
     List<QcCheckTaskProduce> getOrderWorks(ProOrderWorkorderDTO qoWork);
 
 	List<String> selectQcCheckTaskCheckNoByRecordIds(String[] recordIds);
+
+	/**
+	 * 查询来料报告
+	 *
+	 * @param qcCheckReportIncome 来料检验
+	 * @return 来料检验集合
+	 */
+	public List<QcCheckReportIncome> selectQcCheckReportIncomeList(QcCheckReportIncome qcCheckReportIncome);
 }
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java
index 0dd13d13..139a58d4 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java
@@ -5,11 +5,9 @@ import com.op.common.core.utils.DateUtils;
 import com.op.common.core.utils.uuid.IdUtils;
 import com.op.common.security.utils.SecurityUtils;
 import com.op.quality.domain.*;
-import com.op.quality.mapper.QcCheckReportIncomeMapper;
-import com.op.quality.mapper.QcCheckTaskDetailMapper;
-import com.op.quality.mapper.QcCheckTypeProjectMapper;
-import com.op.quality.mapper.QcMaterialGroupDetailMapper;
+import com.op.quality.mapper.*;
 import com.op.quality.service.IQcCheckReportProduceService;
+import com.op.quality.service.IQcStaticTableService;
 import com.op.system.api.domain.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -31,6 +29,8 @@ import java.util.List;
 public class QcCheckReportProduceServiceImpl implements IQcCheckReportProduceService {
 	@Autowired
 	private QcCheckReportIncomeMapper qcCheckReportIncomeMapper;
+	@Autowired
+	private QcCheckTaskProduceMapper qcCheckTaskProduceMapper;
 
 	@Autowired
 	private QcCheckTypeProjectMapper qcCheckTypeProjectMapper;
@@ -40,7 +40,8 @@ public class QcCheckReportProduceServiceImpl implements IQcCheckReportProduceSer
 
 	@Autowired
 	private QcCheckTaskDetailMapper qcCheckTaskDetailMapper;
-
+	@Autowired
+	private IQcStaticTableService qcStaticTableService;
 	/**
 	 * 查询来生产过程中验
 	 *
@@ -64,7 +65,7 @@ public class QcCheckReportProduceServiceImpl implements IQcCheckReportProduceSer
 	public List<QcCheckReportIncome> selectQcCheckReportIncomeList(QcCheckReportIncome qcCheckReportIncome) {
 		qcCheckReportIncome.setDelFlag("0");
 		qcCheckReportIncome.setTypeCode("produce");
-		return qcCheckReportIncomeMapper.selectQcCheckReportIncomeList(qcCheckReportIncome);
+		return qcCheckTaskProduceMapper.selectQcCheckReportIncomeList(qcCheckReportIncome);
 	}
 
 	/**
@@ -197,8 +198,14 @@ public class QcCheckReportProduceServiceImpl implements IQcCheckReportProduceSer
 	}
 
 	@Override
-	public List<QcCheckReportIncome> getPrintData(QcCheckReportIncome qcCheckReportIncome) {
-		return null;
+	@DS("#header.poolName")
+	public QcCheckTaskProduce getProduceReportXJ(QcCheckTaskProduce qcCheckTaskProduce) {
+		QcCheckTaskProduce produce = qcCheckReportIncomeMapper.getTopInfo(qcCheckTaskProduce);
+		QcStaticTable qcStaticTable = new QcStaticTable();
+		qcStaticTable.setOrderNo(qcCheckTaskProduce.getOrderNo());
+		List<QcStaticTable> checkInfos = qcStaticTableService.getXJCheckTableDetail(qcStaticTable);
+		produce.setCheckInfos(checkInfos);
+		return produce;
 	}
 
 }
diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml
index f15925ab..3a51db6a 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml
@@ -48,11 +48,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="selectQcCheckReportIncomeList" parameterType="QcCheckReportIncome" resultMap="QcCheckReportIncomeResult">
 		select qct.record_id, qct.check_no, qct.income_batch_no,
-			qct.order_no, qct.material_code, qct.material_name, qct.quality, qct.unit,
-			qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_loc, qct.check_status,
-			qct.check_man_code, qct.check_man_name,qct.check_time, qct.check_result, qct.status,qct.sample_quality,
-			qct.create_by,qct.create_time, qct.update_by, qct.update_time,qct.check_type,
-		    q.type_code,q.check_name
+		qct.order_no, qct.material_code, qct.material_name, qct.quality, qct.unit,
+		qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_loc, qct.check_status,
+		qct.check_man_code, qct.check_man_name,qct.check_time, qct.check_result, qct.status,qct.sample_quality,
+		qct.create_by,qct.create_time, qct.update_by, qct.update_time,qct.check_type,
+		q.type_code,q.check_name
 		from qc_check_task qct
 		left join qc_check_type q on q.id = qct.check_type
 		<where>
@@ -143,8 +143,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		left join qc_check_type_project qctp on td.type_project_id = qctp.id
         where td.belong_to = #{recordId}
 	</select>
+    <select id="getTopInfo" resultType="com.op.quality.domain.QcCheckTaskProduce">
+		select t.*,be.equipment_name lineName from(
+			 SELECT
+				  c.order_no orderNo,
+			      c.supplier_name supplierName,
+			      c.supplier_code supplierCode,
+			      c.material_name materialName,
+			      c.material_code materialCode,
+			      CONVERT(varchar(10),c.income_time, 120) checkTimeStart,
+				 stuff( ( SELECT ';' + income_batch_no FROM qc_check_task WHERE c.order_no= order_no FOR xml path ( '' ) ), 1, 1, '' ) as incomeBatchNo
+			 FROM
+				 qc_check_task c
+			 where c.check_type='checkTypeSCXJ' and c.order_no = #{orderNo}
+			 GROUP BY
+				 c.order_no,c.supplier_name,c.supplier_code,c.material_name,c.material_code,CONVERT(varchar(10),c.income_time, 120)
+		) t
+		left join pro_order_workorder pow on pow.workorder_code = t.orderNo
+		left join base_equipment be on be.equipment_code = pow.workorder_name
+	</select>
 
-	<insert id="insertQcCheckReportIncome" parameterType="QcCheckReportIncome">
+    <insert id="insertQcCheckReportIncome" parameterType="QcCheckReportIncome">
 		insert into qc_check_task
 		<trim prefix="(" suffix=")" suffixOverrides=",">
 			<if test="recordId != null">record_id,</if>
diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml
index 77edb220..31eb4ce1 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml
@@ -11,9 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="orderNo"	column="order_no"	/>
 		<result property="materialCode"	column="material_code"	/>
 		<result property="materialName"	column="material_name"	/>
-		<result property="quality"	column="quality"	/>
-		<result property="sampleQuality"	column="sample_quality"	/>
-		<result property="noOkQuality"	column="noOk_quality"	/>
+		<result property="quality"	column="quality" />
 		<result property="unit"	column="unit"	/>
 		<result property="supplierCode"	column="supplier_code"	/>
 		<result property="supplierName"	column="supplier_name"	/>
@@ -35,9 +33,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="updateTime"	column="update_time"	/>
 		<result property="factoryCode"	column="factory_code"	/>
 		<result property="delFlag"	column="del_flag"	/>
-		<result property="checkType"	column="check_type"	/>
-		<result property="checkName"	column="check_name"	/>
+		<result property="sampleQuality" column="sample_quality" />
+		<result property="checkName" column="check_name" />
+		<result property="checkType" column="check_type"/>
+	</resultMap>
 
+	<resultMap type="QcCheckReportIncome" id="QcCheckReportIncomeResult">
+		<result property="recordId"	column="record_id"	/>
+		<result property="checkNo"	column="check_no"	/>
+		<result property="incomeBatchNo"	column="income_batch_no"	/>
+		<result property="orderNo"	column="order_no"	/>
+		<result property="materialCode"	column="material_code"	/>
+		<result property="materialName"	column="material_name"	/>
+		<result property="quality"	column="quality" />
+		<result property="unit"	column="unit"	/>
+		<result property="supplierCode"	column="supplier_code"	/>
+		<result property="supplierName"	column="supplier_name"	/>
+		<result property="incomeTime"	column="income_time"	/>
+		<result property="checkLoc"	column="check_loc"	/>
+		<result property="checkStatus"	column="check_status"	/>
+		<result property="checkManCode"	column="check_man_code"	/>
+		<result property="checkManName"	column="check_man_name"	/>
+		<result property="checkTime"	column="check_time"	/>
+		<result property="checkResult"	column="check_result"	/>
+		<result property="status"	column="status"	/>
+		<result property="attr1"	column="attr1"	/>
+		<result property="attr2"	column="attr2"	/>
+		<result property="attr3"	column="attr3"	/>
+		<result property="attr4"	column="attr4"	/>
+		<result property="createBy"	column="create_by"	/>
+		<result property="createTime"	column="create_time"	/>
+		<result property="updateBy"	column="update_by"	/>
+		<result property="updateTime"	column="update_time"	/>
+		<result property="factoryCode"	column="factory_code"	/>
+		<result property="delFlag"	column="del_flag"	/>
+		<result property="sampleQuality" column="sample_quality" />
+		<result property="checkName" column="check_name" />
+		<result property="checkType" column="check_type"/>
+		<result property="createTimeStr"	column="createTimeStr"	/>
 	</resultMap>
 
 	<sql id="selectQcCheckTaskProduceVo">
@@ -266,4 +299,61 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			#{recordId}
 		</foreach>
 	</select>
+    <select id="selectQcCheckReportIncomeList" parameterType="QcCheckReportIncome" resultMap="QcCheckReportIncomeResult">
+		select * from (
+			select qct.record_id, qct.check_no, qct.income_batch_no,
+			qct.order_no, qct.material_code, qct.material_name, qct.quality, qct.unit,
+			qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_loc, qct.check_status,
+			qct.check_time, qct.check_result, qct.check_type,'首件检验' check_name,
+			       CONVERT(varchar(10),qct.create_time, 120) createTimeStr
+			from qc_check_task qct
+			<where>
+				<if test="checkNo != null  and checkNo != ''"> and qct.check_no = #{checkNo}</if>
+				<if test="incomeBatchNo != null  and incomeBatchNo != ''"> and qct.income_batch_no = #{incomeBatchNo}</if>
+				<if test="orderNo != null  and orderNo != ''"> and qct.order_no = #{orderNo}</if>
+				<if test="materialCode != null  and materialCode != ''"> and qct.material_code = #{materialCode}</if>
+				<if test="materialName != null  and materialName != ''"> and qct.material_name like concat('%', #{materialName}, '%')</if>
+				<if test="supplierCode != null  and supplierCode != ''"> and qct.supplier_code = #{supplierCode}</if>
+				<if test="supplierName != null  and supplierName != ''"> and qct.supplier_name like concat('%', #{supplierName}, '%')</if>
+				<if test="checkLoc != null  and checkLoc != ''"> and qct.check_loc = #{checkLoc}</if>
+				<if test="checkStatus != null  and checkStatus != ''"> and qct.check_status = #{checkStatus}</if>
+				<if test="checkManCode != null  and checkManCode != ''"> and qct.check_man_code = #{checkManCode}</if>
+				<if test="checkManName != null  and checkManName != ''"> and qct.check_man_name like concat('%', #{checkManName}, '%')</if>
+				<if test="checkResult != null  and checkResult != ''"> and qct.check_result = #{checkResult}</if>
+				<if test="incomeTimeStart != null "> and CONVERT(varchar(30),qct.income_time, 120) >= #{incomeTimeStart}</if>
+				<if test="incomeTimeEnd != null "> and #{incomeTimeEnd} > CONVERT(varchar(30),qct.income_time, 120)</if>
+				<if test="checkTimeStart != null "> and CONVERT(varchar(30),qct.create_time, 120) >= #{checkTimeStart}</if>
+				<if test="checkTimeEnd != null "> and #{checkTimeEnd} > CONVERT(varchar(30),qct.create_time, 120)</if>
+				and qct.check_type = 'checkTypeSC'
+			</where>
+			union ALL
+			select
+			'','','',
+			qct.order_no, qct.material_code, qct.material_name, qct.quality, qct.unit,
+			qct.supplier_code, qct.supplier_name, qct.income_time,'','',
+			'','', qct.check_type,'巡检检验' check_name,CONVERT(varchar(10),qct.create_time, 120) createTimeStr
+			from qc_check_task qct
+			<where>
+				<if test="checkNo != null  and checkNo != ''"> and qct.check_no = #{checkNo}</if>
+				<if test="incomeBatchNo != null  and incomeBatchNo != ''"> and qct.income_batch_no = #{incomeBatchNo}</if>
+				<if test="orderNo != null  and orderNo != ''"> and qct.order_no = #{orderNo}</if>
+				<if test="materialCode != null  and materialCode != ''"> and qct.material_code = #{materialCode}</if>
+				<if test="materialName != null  and materialName != ''"> and qct.material_name like concat('%', #{materialName}, '%')</if>
+				<if test="supplierCode != null  and supplierCode != ''"> and qct.supplier_code = #{supplierCode}</if>
+				<if test="supplierName != null  and supplierName != ''"> and qct.supplier_name like concat('%', #{supplierName}, '%')</if>
+				<if test="checkLoc != null  and checkLoc != ''"> and qct.check_loc = #{checkLoc}</if>
+				<if test="checkStatus != null  and checkStatus != ''"> and qct.check_status = #{checkStatus}</if>
+				<if test="checkManCode != null  and checkManCode != ''"> and qct.check_man_code = #{checkManCode}</if>
+				<if test="checkManName != null  and checkManName != ''"> and qct.check_man_name like concat('%', #{checkManName}, '%')</if>
+				<if test="checkResult != null  and checkResult != ''"> and qct.check_result = #{checkResult}</if>
+				<if test="incomeTimeStart != null "> and CONVERT(varchar(30),qct.income_time, 120) >= #{incomeTimeStart}</if>
+				<if test="incomeTimeEnd != null "> and #{incomeTimeEnd} > CONVERT(varchar(30),qct.income_time, 120)</if>
+				<if test="checkTimeStart != null "> and CONVERT(varchar(30),qct.create_time, 120) >= #{checkTimeStart}</if>
+				<if test="checkTimeEnd != null "> and #{checkTimeEnd} > CONVERT(varchar(30),qct.create_time, 120)</if>
+				and qct.check_type = 'checkTypeSCXJ'
+			</where>
+			GROUP BY qct.order_no, qct.material_code, qct.material_name, qct.quality, qct.unit,
+			qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_type,CONVERT(varchar(10),qct.create_time, 120)
+		) t  order by t.order_no,t.createTimeStr desc
+	</select>
 </mapper>