From 474aaf8f03493ce7c34c1ce467122c8ad58f9f02 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Wed, 21 May 2025 10:52:31 +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

---
 .../main/java/com/op/quality/domain/QcStaticTable.java   | 9 +++++++++
 .../java/com/op/quality/mapper/QcStaticTableMapper.java  | 2 ++
 .../quality/service/impl/QcStaticTableServiceImpl.java   | 6 ++++++
 .../resources/mapper/quality/QcStaticTableMapper.xml     | 8 +++++++-
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java
index 3f5724cd0..e863d30df 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcStaticTable.java
@@ -81,6 +81,7 @@ public class QcStaticTable extends BaseEntity {
     private String recordId;
     private String detailId;
     private String checkNo;
+    private String groupId;
 
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date incomeTime;
@@ -125,6 +126,14 @@ public class QcStaticTable extends BaseEntity {
     private String sampleQty;
     private String noOkQty;
 
+    public String getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
+    }
+
     public String getOkNumRate() {
         return okNumRate;
     }
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java
index e53521038..ec27b291f 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcStaticTableMapper.java
@@ -157,4 +157,6 @@ public interface QcStaticTableMapper {
     @MapKey("ymdms")
     Map<String, QcStaticTable> getCpSampMap(QcStaticTable qcStaticTable);
     List<String> getCpDefectTypes(QcStaticTable qcStaticTable);
+
+    String getGroupIdByOrderNo(String orderNo);
 }
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 00b86ca9d..c8caaac1d 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
@@ -311,6 +311,12 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService {
     @Override
     @DS("#header.poolName")
     public List<QcStaticTable> getXJCheckTableDetail(QcStaticTable qcStaticTable) {
+
+        String groupId = qcStaticTableMapper.getGroupIdByOrderNo(qcStaticTable.getOrderNo());
+        if(StringUtils.isBlank(groupId) || groupId.indexOf("-")<0){
+            groupId = "3dc0655fea3449c59c76a01cc5b91565";
+        }
+        qcStaticTable.setGroupId(groupId);
         List<QcStaticTable> projects = qcStaticTableMapper.getXJProjects(qcStaticTable);
         Map<String, QcStaticTable> detailMap = null;
         if(qcStaticTable.getShiftId().equals("5")){
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 ecc235e53..1dacab47d 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
@@ -222,7 +222,7 @@
 				qctp.project_no projectNo
 		from qc_check_type_project qctp
 		left join qc_check_project qct on qctp.project_id = qct.id
-		where qctp.type_id = 'checkTypeSCXJ' and qctp.del_flag = '0' and qct.del_flag = '0'
+		where qctp.type_id = 'checkTypeSCXJ' and qctp.del_flag = '0' and qct.del_flag = '0' and qctp.group_id = #{groupId}
 		order by qctp.sort
 	</select>
     <select id="getProjectDetail" resultType="com.op.quality.domain.QcStaticTable">
@@ -1399,5 +1399,11 @@
                    and CONVERT(varchar(7),qct.create_time, 120) = #{yearMonth}
              ) t group by t.ymdms
     </select>
+    <select id="getGroupIdByOrderNo" resultType="java.lang.String">
+        select bp.mvgr5
+        from pro_order_workorder pow
+                 left join base_product bp on bp.product_code = pow.product_code
+        where pow.workorder_code = #{orderNo}
+    </select>
 
 </mapper>