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 4d022ac7..c73f47c9 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 @@ -81,4 +81,5 @@ public interface QcCheckReportIncomeMapper { QcCheckReportIncome getXJTaskInfo(QcCheckReportIncome qcCheckReportIncome); QcCheckReportIncome getLastXJTaskInfo(QcCheckReportIncome qcCheckReportIncome); + QcCheckTaskProduce getLastProductTypeInfo(QcCheckTaskProduce qcCheckTaskProduce); } 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 69576ee2..02c5a766 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 @@ -209,6 +209,14 @@ public class QcCheckReportProduceServiceImpl implements IQcCheckReportProduceSer qcStaticTable.setOrderNo(qcCheckTaskProduce.getOrderNo()); List 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; } 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 10a5874f..19a6acd6 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 @@ -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 + insert into qc_check_task