杀蟑饵剂、双智星启用首件巡检标准检测项2

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<BaseProductDTO> updates);
 
     int addProductNoBatchs(@Param("list")List<BaseProductDTO> everyList);
+
+    String getProductGroup(String materialCode);
 //
 //    int updateEquBatchs(@Param("list") List<EquEquipmentDTO> updates);
 //

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<QcCheckTaskDetailDTO> itemsGG = openMapper.getTPByTypeGroup(qctp);

op-modules/op-open/src/main/resources/mapper/open/OpenMapper.xml

@@ -463,5 +463,13 @@
             #{code}
         </foreach>
     </select>
+    <select id="getProductGroup" resultType="java.lang.String">
+        select top 1 qmg.id groupId
+        from base_product bp
+                 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
+    </select>
 
 </mapper>