2023-07-20，设备和质量修改2

src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java

@@ -1803,7 +1803,7 @@ public class QcServiceImpl implements QcService {
             // 主记录信息赋值
             qcFAIRecordData.setState("待检验"); // 状态
             qcFAIRecordData.setInspectionTypeNo("101"); // 检验类型编码
-            qcFAIRecordData.setCheckType("末件检");
+            qcFAIRecordData.setCheckType("首件检");
             qcFAIRecordData.setOrderNo(recordData.getOrderNo()); // 工单号
             qcFAIRecordData.setOperationDesc(recordData.getOperationDesc()); // 工序
             qcFAIRecordData.setResourceId(recordData.getResourceId()); // 机台号
@@ -1818,7 +1818,7 @@ public class QcServiceImpl implements QcService {
             String attributeType1 = "A";
             // 获取该物料属性下维护的IPQC检验模板
             List<QcFAIRecordData> partAttribute = qcMapper.selectPartAttributeByPartNo(partNo, attributeType1, qcFAIRecordData.getInspectionTypeNo());
-            if (partAttribute != null){
+            if (partAttribute != null && partAttribute.size() > 0){
                 qcFAIRecordData.setInspectionCycle(partAttribute.get(0).getInspectionCycle());
 
                 // 获取抽样数量
@@ -1880,8 +1880,6 @@ public class QcServiceImpl implements QcService {
                     qcFAIRecordData.setInspectionCycle(null);
                 }else {
                     qcFAIRecordData.setInspectionCycle(familyAttribute.getInspectionCycle());
-                }
-
                     // 获取抽样数量
                     QcSamplingInspectionProgrammeData samplingInspectionProgrammeData = new QcSamplingInspectionProgrammeData();
                     if (familyAttribute.getSamplingProgrammeNo() !=  null){
@@ -1903,7 +1901,6 @@ public class QcServiceImpl implements QcService {
                     if (qcFAIRecordData.getSamplingQty() == null){
                         qcFAIRecordData.setSamplingQty(familyAttribute.getDefaultSamplingProportion().multiply(qcFAIRecordData.getRollQty()).divide(new BigDecimal(100),3,BigDecimal.ROUND_HALF_UP));
                     }
-
                     // 获取根据该检验模板下维护的检验项目
                     QcTemplateData templateData = new QcTemplateData();
                     templateData.setTemplateId(familyAttribute.getTemplateId());
@@ -1934,6 +1931,7 @@ public class QcServiceImpl implements QcService {
                         qcMapper.saveIPQCDetailedRecord(faiRecordData);
                     }
                 }
+            }
             // 新增IPQC主记录信息
             qcMapper.saveIPQCRecord(qcFAIRecordData);
         }

src/main/resources/mapper/pms/QcMapper.xml

@@ -1694,6 +1694,9 @@
             <if test = "query.inspectionNo != null and query.inspectionNo != ''">
                 AND inspection_no LIKE '%' + #{query.inspectionNo} + '%'
             </if>
+            <if test = "query.partNo != null and query.partNo != ''">
+                AND part_no LIKE '%' + #{query.partNo} + '%'
+            </if>
             <if test = "query.state != null and query.state != ''">
                 AND `state` = #{query.state}
             </if>