diff --git a/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java b/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java index 526c3039b..020168873 100644 --- a/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java +++ b/op-modules/op-open/src/main/java/com/op/open/mapper/OpenMapper.java @@ -97,6 +97,8 @@ public interface OpenMapper { int updateProductNoBatchs(@Param("list") List updates); int addProductNoBatchs(@Param("list")List everyList); + + String getProductGroup(String materialCode); // // int updateEquBatchs(@Param("list") List updates); // diff --git a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java index dc7a63064..806297dc0 100644 --- a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java +++ b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java @@ -451,7 +451,13 @@ public class OpenServiceImpl implements OpenService { QcMaterialGroupDetailDTO group = openMapper.getGroupByMaterial(qcCheckTaskProduce.getMaterialCode()); if (group == null) { group = new QcMaterialGroupDetailDTO(); - group.setGroupId("3dc0655fea3449c59c76a01cc5b91565");//成品蚊香物料组 + + String initGroup = openMapper.getProductGroup(qcCheckTaskProduce.getMaterialCode()); + if(initGroup != null){//包材共性 + group.setGroupId(initGroup); + }else {//成品蚊香物料组 + group.setGroupId("3dc0655fea3449c59c76a01cc5b91565"); + } } qctp.setGroupId(group.getGroupId());//共性 List itemsGG = openMapper.getTPByTypeGroup(qctp); diff --git a/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml b/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml index 2d45742f4..951ae2ea4 100644 --- a/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml +++ b/op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml @@ -463,5 +463,13 @@ #{code} +