From 42cb183e7616955b7d3d11530b98126c6663aeb4 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Fri, 14 Feb 2025 18:10:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8=E6=9C=80=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quality/service/impl/QcCheckTaskIncomeServiceImpl.java | 7 ++++++- 1 file changed, 6 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 0ef93b9ec..ec95fdcce 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 @@ -928,7 +928,12 @@ public class QcCheckTaskIncomeServiceImpl implements ||task.getCheckType().equals("checkTypeSC") ||task.getCheckType().equals("checkTypeCP")){ group = new QcMaterialGroupDetail(); - group.setGroupId("3dc0655fea3449c59c76a01cc5b91565");//成品蚊香物料组 + QcProjectType initGroup = qcCheckTypeProjectMapper.getProductGroup(task.getMaterialCode()); + if(initGroup != null){//包材共性 + group.setGroupId(initGroup.getGroupId()); + }else {//成品蚊香物料组 + group.setGroupId("3dc0655fea3449c59c76a01cc5b91565"); + } }else if(task.getCheckType().equals("checkTypeCC")){ group = new QcMaterialGroupDetail(); QcProjectType initGroup = qcCheckTypeProjectMapper.getProductGroup(task.getMaterialCode());