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 395d7248..d239d3c1 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 @@ -107,7 +107,6 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin */ @Override //@Transactional(rollbackFor = Exception.class)不能加 - @DS("#header.poolName") public int insertQcCheckTaskWarehousing(QcCheckTaskWarehousing qcCheckTaskWarehousing) { if(StringUtils.isNotBlank(qcCheckTaskWarehousing.getFactoryCode())){ @@ -139,10 +138,12 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin /**qc_material_group_detail**/ QcMaterialGroupDetail group = qcMaterialGroupDetailMapper.getGroupByMaterial(qcCheckTaskWarehousing.getMaterialCode()); if(group == null){ - return 0;//没有找到检测项目 + group = new QcMaterialGroupDetail(); + group.setGroupId("3dc0655fea3449c59c76a01cc5b91565");//成品蚊香物料组 } qctp.setGroupId(group.getGroupId());//共性 - items = qcCheckTypeProjectMapper.getTPByTypeGroup(qctp); + List itemsGG = qcCheckTypeProjectMapper.getTPByTypeGroup(qctp); + items.addAll(itemsGG); } /**qc_check_task_detail**/