1.物料属性 增加 pqc类型检验模板 去除限制 一个模板

2.物料属性 增加 pqc类型检验模板 增加工序选择

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名称
      */

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);
 }

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;
     }
 

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