From cced282c9fd665f383f083be65627d2e7ab54d6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com>
Date: Fri, 22 Aug 2025 11:15:16 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=89=A9=E6=96=99=E5=B1=9E=E6=80=A7=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20pqc=E7=B1=BB=E5=9E=8B=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=20=E5=8E=BB=E9=99=A4=E9=99=90=E5=88=B6=20?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=A8=A1=E6=9D=BF=202.=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=20=E5=A2=9E=E5=8A=A0=20pqc=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=A8=A1=E6=9D=BF=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/pms/data/QcPartAttributeData.java   | 10 ++++++++++
 .../xujie/sys/modules/pms/mapper/QcMapper.java  |  2 ++
 .../modules/pms/service/Impl/QcServiceImpl.java | 17 ++++++++++++-----
 src/main/resources/mapper/pms/QcMapper.xml      |  9 +++++++++
 4 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/data/QcPartAttributeData.java b/src/main/java/com/xujie/sys/modules/pms/data/QcPartAttributeData.java
index 002b0c85..a86b1ce0 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/QcPartAttributeData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/QcPartAttributeData.java
@@ -120,6 +120,16 @@ public class QcPartAttributeData extends QueryPage {
      * 用户名
      */
     private String userName;
+    private String inspectionTypeNo;
+
+    public String getInspectionTypeNo() {
+        return inspectionTypeNo;
+    }
+
+    public void setInspectionTypeNo(String inspectionTypeNo) {
+        this.inspectionTypeNo = inspectionTypeNo;
+    }
+
     /**
      * bu名称
      */
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 78ebf175..2d9215d7 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
@@ -636,4 +636,6 @@ public interface QcMapper {
     void deleteEquipmentFolderLocationList(QCEquipmentFolderLocation data);
 
     int checkEquipmentFolderLocation(QCEquipmentFolderLocation inData);
+
+    List<QcPartAttributeData> getPqcOperationDescList(QcPartAttributeData data);
 }
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 a9fc9c63..5793d83b 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
@@ -1191,10 +1191,11 @@ public class QcServiceImpl implements QcService {
                     }
                 } else if ("108".equals(partData.getInspectionTypeNo())) { // PQC
                     // 同一物料同一类型的模板只能存在一个
-                    List<QcTemplateData> paList = pqcMapper.getPartAttribute(partData);
-                    if (!paList.isEmpty()) {
-                        throw new RuntimeException("PQC的检验模板只能存在一个！");
-                    }
+//                    List<QcTemplateData> paList = pqcMapper.getPartAttribute(partData);
+//                    if (!paList.isEmpty()) {
+//                        throw new RuntimeException("PQC的检验模板只能存在一个！");
+//                    }
+                    partData.setOperation(data.getOperation());
                     // 新增
                     qcMapper.savePartAttributeDetails(partData);
                 }
@@ -3592,7 +3593,13 @@ public class QcServiceImpl implements QcService {
      **/
     @Override
     public List<QcPartAttributeData> getOperationDescList(QcPartAttributeData data) {
-        List<QcPartAttributeData> list = qcMapper.getOperationDescList(data);
+        List<QcPartAttributeData> list;
+        if (data.getInspectionTypeNo().equals("108")){
+            list = qcMapper.getPqcOperationDescList(data);
+        }else {
+            list = qcMapper.getOperationDescList(data);
+        }
+
         return list;
     }
 
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index 96b41ab0..6f2dd401 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -1121,6 +1121,9 @@
             <if test="inspectionTypeNo !=null and inspectionTypeNo != ''">
                 and qt.inspection_type_no = #{inspectionTypeNo}
             </if>
+            <if test="operation !=null and operation != ''">
+                and qat.operation = #{operation}
+            </if>
         </where>
     </select>
 
@@ -4290,6 +4293,12 @@
             </if>
         </where>
     </select>
+    <select id="getPqcOperationDescList" resultType="com.xujie.sys.modules.pms.data.QcPartAttributeData">
+        select qro.description as operationDesc
+        from operation_resource a
+                 left join qc_pqc_record_operation qro on a.operation = qro.code
+        GROUP BY qro.description
+    </select>
     <update id="updateEquipmentFolderLocation">
         UPDATE Equipment_folder_location
         SET