From 65a34e162d3b461786081e8f5ab77a7d4ed89146 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Fri, 30 May 2025 14:54:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=B3=E6=9C=BA=E5=B7=A1=E6=A3=80=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8Abug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/op/quality/service/impl/QcStaticTableServiceImpl.java  | 2 +-
 .../src/main/resources/mapper/quality/QcStaticTableMapper.xml  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java
index c8caaac1d..2d157333a 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java
@@ -313,7 +313,7 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService {
     public List<QcStaticTable> getXJCheckTableDetail(QcStaticTable qcStaticTable) {
 
         String groupId = qcStaticTableMapper.getGroupIdByOrderNo(qcStaticTable.getOrderNo());
-        if(StringUtils.isBlank(groupId) || groupId.indexOf("-")<0){
+        if(StringUtils.isBlank(groupId)){
             groupId = "3dc0655fea3449c59c76a01cc5b91565";
         }
         qcStaticTable.setGroupId(groupId);
diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml
index 1dacab47d..4c0ff7ef0 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml
@@ -1400,9 +1400,10 @@
              ) t group by t.ymdms
     </select>
     <select id="getGroupIdByOrderNo" resultType="java.lang.String">
-        select bp.mvgr5
+        select qmg.id
         from pro_order_workorder pow
                  left join base_product bp on bp.product_code = pow.product_code
+                 left join qc_material_group qmg on qmg.group_code = bp.mvgr5
         where pow.workorder_code = #{orderNo}
     </select>