From 24f317f286c8c7dc7971087366749e373925b192 Mon Sep 17 00:00:00 2001 From: shaoyong Date: Tue, 13 Aug 2024 10:38:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8D=89=E7=A8=BF=E5=8A=9F=E8=83=BD=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java | 3 ++- .../main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) 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 3423a0e7..ed4b2564 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 @@ -714,7 +714,7 @@ public class QcCheckTaskIncomeServiceImpl implements qcCheckTask.setOaFactoryF(qcCheckTaskIncome.getOaFactoryF());// 异常范围 qcCheckTask.setSfxyzg(qcCheckTaskIncome.getSfxyzg());// 是否需要主管审核 qcCheckTask.setPgzg(qcCheckTaskIncome.getPgzg());// QC主管 - qcCheckTask.setPgzr(qcCheckTask.getPgzr()); // 质量主管 + qcCheckTask.setPgzr(qcCheckTaskIncome.getPgzr()); // 质量主管 qcCheckTask.setSfgyswt(qcCheckTaskIncome.getSfgyswt());// 是否供应商 qcCheckTask.setSccj(qcCheckTaskIncome.getSccj());// 所属车间 qcCheckTask.setSqr(qcCheckTaskIncome.getSqr());// 申请人Id @@ -733,6 +733,7 @@ public class QcCheckTaskIncomeServiceImpl implements qcCheckTask.setOrderTypeDesc(qcCheckTaskIncome.getOrderTypeDesc()); qcCheckTask.setCreateBy(qcCheckTaskIncome.getCreateBy()); qcCheckTask.setCreateTime(DateUtils.getNowDate()); + qcCheckTask.setIncomeTime(qcCheckTaskIncome.getIncomeTime()); qcCheckTask.setFactoryCode(qcCheckTaskIncome.getFactoryCode()); qcCheckTask.setCheckType(qcCheckTaskIncome.getCheckType()); 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 4159ccc0..fbb784b1 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 @@ -623,11 +623,14 @@ qct.bz attr3, qct.check_type checkType, qct.sample_quality sampleQuality, + qct.oa_factory oaFactory, qct.oa_factory_f oaFactoryF, qct.start_oA startOA, qct.sqbm, qct.sqr, qct.sfxyzg, + qct.pgzg, + qct.pgzr, qct.sfgyswt, qct.sccj from qc_check_task_cg qct