检验报告首检巡检优化

op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java

@@ -81,4 +81,5 @@ public interface QcCheckReportIncomeMapper {
 	QcCheckReportIncome getXJTaskInfo(QcCheckReportIncome qcCheckReportIncome);
 
 	QcCheckReportIncome getLastXJTaskInfo(QcCheckReportIncome qcCheckReportIncome);
+	QcCheckTaskProduce getLastProductTypeInfo(QcCheckTaskProduce qcCheckTaskProduce);
 }

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java

@@ -209,6 +209,14 @@ public class QcCheckReportProduceServiceImpl implements IQcCheckReportProduceSer
 		qcStaticTable.setOrderNo(qcCheckTaskProduce.getOrderNo());
 		List<QcStaticTable> checkInfos = qcStaticTableService.getXJCheckTableDetail(qcStaticTable);
 		produce.setCheckInfos(checkInfos);
+		QcCheckTaskProduce lastProduce = qcCheckReportIncomeMapper.getLastProductTypeInfo(qcCheckTaskProduce);
+		if(lastProduce != null ){
+			produce.setProductType(lastProduce.getProductType());
+			produce.setCheckManCode(lastProduce.getCheckManCode());
+			produce.setCheckManName(lastProduce.getCheckManName());
+			produce.setConfirmManCode(lastProduce.getConfirmManCode());
+			produce.setConfirmManName(lastProduce.getConfirmManName());
+		}
 		return produce;
 	}
 

op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml

@@ -217,6 +217,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where c.check_type='checkTypeSCXJ' and c.order_no = #{orderNo}
 		order by c.create_time desc
 	</select>
+	<select id="getLastProductTypeInfo" resultType="com.op.quality.domain.QcCheckTaskProduce">
+		SELECT
+			top 1
+			c.product_type productType,
+			c.check_man_code checkManCode,
+			c.check_man_name checkManName,
+			c.confirm_man_code confirmManCode,
+			c.confirm_man_name confirmManName
+		FROM
+			qc_check_task c
+		where c.check_type='checkTypeSCXJ' and c.order_no = #{orderNo}
+		order by c.create_time desc
+	</select>
 	<insert id="insertQcCheckReportIncome" parameterType="QcCheckReportIncome">
 		insert into qc_check_task
 		<trim prefix="(" suffix=")" suffixOverrides=",">