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 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 paList = pqcMapper.getPartAttribute(partData); - if (!paList.isEmpty()) { - throw new RuntimeException("PQC的检验模板只能存在一个!"); - } +// List 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 getOperationDescList(QcPartAttributeData data) { - List list = qcMapper.getOperationDescList(data); + List 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 @@ and qt.inspection_type_no = #{inspectionTypeNo} + + and qat.operation = #{operation} + @@ -4290,6 +4293,12 @@ + UPDATE Equipment_folder_location SET