From 35399d7b1b8cf42f250f57a3d1b510a7ca95d00d Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Fri, 21 Feb 2025 11:32:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E6=80=A7=E6=A3=80=E9=AA=8C=E6=96=B9?= =?UTF-8?q?=E6=A1=88=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/QcCheckTaskWarehousingServiceImpl.java | 8 ++++++-- .../resources/mapper/quality/QcCheckTypeProjectMapper.xml | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java index e5d78b64d..b14512728 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java @@ -155,7 +155,6 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin Date nowDate= DateUtils.getNowDate(); String factoryCode = qcCheckTaskWarehousing.getFactoryCode(); - qcCheckTaskWarehousing.setCheckNo(bpDD+liushuiStr); /**取检测项**/ @@ -170,7 +169,12 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin QcMaterialGroupDetail group = qcMaterialGroupDetailMapper.getGroupByMaterial(qcCheckTaskWarehousing.getMaterialCode()); if(group == null){ group = new QcMaterialGroupDetail(); - group.setGroupId("3dc0655fea3449c59c76a01cc5b91565");//成品蚊香物料组 + QcProjectType initGroup = qcCheckTypeProjectMapper.getProductGroup(qcCheckTaskWarehousing.getMaterialCode()); + if(initGroup != null){//包材共性 + group.setGroupId(initGroup.getGroupId()); + }else {//成品蚊香物料组 + group.setGroupId("3dc0655fea3449c59c76a01cc5b91565"); + } } qctp.setGroupId(group.getGroupId());//共性 List itemsGG = qcCheckTypeProjectMapper.getTPByTypeGroup(qctp); diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml index 5ce06a856..bf4eb1f8d 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml @@ -324,7 +324,7 @@ select top 1 qmg.id groupId from base_product bp - left join qc_material_group qmg on qmg.group_code = bp.mvgr5 + left join qc_material_group qmg on qmg.group_code = bp.mvgr5 where bp.product_code like concat('%',#{materialCode},'%') and bp.del_flag = '0' and qmg.del_flag = '0' order by qmg.create_time desc