From d1547f10c05bf9c35c0f453b031bb5592f303ebd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com>
Date: Wed, 15 Oct 2025 16:15:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/modules/pms/mapper/QcMapper.java      |  2 ++
 .../pms/service/Impl/QcServiceImpl.java       | 13 ++++---
 src/main/resources/mapper/pms/QcMapper.xml    | 34 +++++++++++++++++--
 3 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java
index 2e827d8f..946b499c 100644
--- a/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java
+++ b/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java
@@ -434,6 +434,8 @@ public interface QcMapper {
 
     List<QcTemplateData> getItem(QcTemplateData data);
 
+    List<QcTemplateData> getItem2(QcTemplateData data);
+
     List<QcMethodData> queryMethodList(QcMethodData data);
 
     void updateIQCDetailFlag(QcFAIRecordData qcData);
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
index da284053..79a3218a 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
@@ -211,7 +211,7 @@ public class QcServiceImpl implements QcService {
             data.setItemNo("PQC-" + itemNo);
         } else if ("GX".equals(data.getInspectionTypeNo())) {
             data.setItemNo("GX-" + itemNo);
-        }else if ("PF".equals(data.getInspectionTypeNo())) {
+        }else if ("***".equals(data.getInspectionTypeNo())) {
             data.setItemNo("PF-" + itemNo);
         }
         List<QcItemData> checkItemOnlyOne = qcMapper.checkItemOnlyOne(data);
@@ -537,7 +537,7 @@ public class QcServiceImpl implements QcService {
             data.setTemplateId("PQC-" + templateNo);
         } else if ("GX".equals(data.getInspectionTypeNo())) {
             data.setTemplateId("GX-" + templateNo);
-        }else if ("PF".equals(data.getInspectionTypeNo())) {
+        }else if ("***".equals(data.getInspectionTypeNo())) {
             data.setTemplateId("PF-" + templateNo);
         }
         List<QcTemplateData> checkTemplateOnlyOne = qcMapper.checkTemplateOnlyOne(data);
@@ -640,7 +640,12 @@ public class QcServiceImpl implements QcService {
      **/
     @Override
     public List<QcTemplateData> getItem(QcTemplateData data) {
-        List<QcTemplateData> list = qcMapper.getItem(data);
+        List<QcTemplateData> list;
+        if (data.getItemType().equals("E") || data.getItemType().equals("***")) {
+            list = qcMapper.getItem2(data);
+        }else {
+            list = qcMapper.getItem(data);
+        }
         return list;
     }
 
@@ -3694,8 +3699,6 @@ public class QcServiceImpl implements QcService {
             }
 
             data.setBuNo(data.getBu().split("_")[1]);
-        } else {
-            throw new RuntimeException("工厂和部门有误!");
         }
         List<QcFAIRecordData> list = qcMapper.getSpecialOperationList2(data);
         return list;
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index 386493d0..d19b3804 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -435,7 +435,10 @@
                 AND qt.inspection_type_no = #{query.inspectionTypeNo}
             </if>
             <if test = "query.inspectionTypeNo == null or query.inspectionTypeNo == ''">
-                AND qt.inspection_type_no not in ('GX','LC')
+                AND qt.inspection_type_no not in ('GX','***')
+            </if>
+            <if test = "query.operation != null and query.operation != ''">
+                AND qt.operation_no = #{query.operation}
             </if>
         </where>
         order by qt.create_time desc
@@ -583,6 +586,31 @@
         </where>
     </select>
 
+    <select id="getItem2" resultType="com.xujie.sys.modules.pms.data.QcTemplateData">
+        SELECT
+        a.site,
+        a.bu_no,
+        a.itemNo,
+        a.ItemDesc,
+        a.DefaultValue,
+        a.MaxValue,
+        a.MinValue
+        FROM  eam_properties_item a
+        LEFT JOIN qc_template_detailed b ON b.template_id = #{templateId} and b.ItemNo = a.ItemNo and a.site = b.site and a.bu_no = b.bu_no
+        <where>
+            a.ItemType = #{itemType} and a.site = #{site} and b.template_id is null and a.bu_no = #{buNo}
+            <if test = "itemNo != null and itemNo != ''">
+                AND a.ItemNo LIKE '%' + #{itemNo} + '%'
+            </if>
+            <if test = "itemDesc != null and itemDesc != ''">
+                AND a.ItemDesc LIKE '%' + #{itemDesc} + '%'
+            </if>
+            <if test = "inspectionTypeNo != null and inspectionTypeNo != ''">
+                AND a.inspection_type_no = #{inspectionTypeNo}
+            </if>
+        </where>
+    </select>
+
 
     <!-- 删除模板 -->
     <delete id="templateDelete" parameterType="com.xujie.sys.modules.pms.data.QcTemplateData">
@@ -4437,8 +4465,8 @@
             <if test = "query.inspectionTypeNo != null and query.inspectionTypeNo != ''">
                 AND qt.inspection_type_no = #{query.inspectionTypeNo}
             </if>
-            <if test = "query.inspectionTypeNo == null or query.inspectionTypeNo == ''">
-                AND qt.inspection_type_no not in ('GX','LC')
+            <if test = "query.operation != null and query.operation != ''">
+                AND qt.operation_no = #{query.operation}
             </if>
         </where>
         order by qt.create_time desc