From 9e334a85bd947f5c74fe7f42cc345b60a4b13a71 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Fri, 16 May 2025 08:56:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=80=E8=9F=91=E9=A5=B5=E5=89=82=E3=80=81?=
 =?UTF-8?q?=E5=8F=8C=E6=99=BA=E6=98=9F=E5=90=AF=E7=94=A8=E9=A6=96=E4=BB=B6?=
 =?UTF-8?q?=E5=B7=A1=E6=A3=80=E6=A0=87=E5=87=86=E6=A3=80=E6=B5=8B=E9=A1=B9?=
 =?UTF-8?q?2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/op/open/mapper/OpenMapper.java      | 2 ++
 .../java/com/op/open/service/impl/OpenServiceImpl.java    | 8 +++++++-
 .../op-open/src/main/resources/mapper/open/OpenMapper.xml | 8 ++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

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