2025-05-05

src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java

@@ -618,4 +618,10 @@ public interface QcMapper {
     List<QmsTaskData> getQMSTask();
 
     void updateQMSTaskById(@Param("id") Integer id);
+
+    void saveFQCDetailedRecord(QcFAIRecordData recordData);
+
+    void saveFAIDetailedRecord(QcFAIRecordData recordData);
+
+    void saveIPQCDetailedRecord(QcFAIRecordData recordData);
 }

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

@@ -1538,7 +1538,10 @@ public class QcServiceImpl implements QcService {
             // 获取检验明细数据
             List<QcFAIRecordData> faiRecordDataList = getInspectionDetails(partAttribute.get(0), data);
             // 新增FAI明细记录信息
-            qcMapper.saveFAIDetailedRecords(faiRecordDataList);
+            for (QcFAIRecordData recordData : faiRecordDataList) {
+                qcMapper.saveFAIDetailedRecord(recordData);
+            }
+            //qcMapper.saveFAIDetailedRecords(faiRecordDataList);
         } else {
             // 明细记录信息赋值
             String partNo = data.getPartNo();
@@ -1564,7 +1567,10 @@ public class QcServiceImpl implements QcService {
                 // 获取检验明细数据
                 List<QcFAIRecordData> faiRecordDataList = getInspectionDetails(partAttribute.get(0), data);
                 // 新增FAI明细记录信息
-                qcMapper.saveFAIDetailedRecords(faiRecordDataList);
+                for (QcFAIRecordData recordData : faiRecordDataList) {
+                    qcMapper.saveFAIDetailedRecord(recordData);
+                }
+                //qcMapper.saveFAIDetailedRecords(faiRecordDataList);
             } else {
                 // 获取物料的类别编码
                 String familyId = qcMapper.selectFamilyIdByPartNo(partNo,data.getSite());
@@ -1582,7 +1588,10 @@ public class QcServiceImpl implements QcService {
                     // 获取检验明细数据
                     List<QcFAIRecordData> faiRecordDataList = getInspectionDetails(familyAttribute.get(0), data);
                     // 新增FAI明细记录信息
-                    qcMapper.saveFAIDetailedRecords(faiRecordDataList);
+                    for (QcFAIRecordData recordData : faiRecordDataList) {
+                        qcMapper.saveFAIDetailedRecord(recordData);
+                    }
+                    //qcMapper.saveFAIDetailedRecords(faiRecordDataList);
                 }
             }
         }
@@ -1941,7 +1950,10 @@ public class QcServiceImpl implements QcService {
             // 获取检验明细数据
             List<QcFAIRecordData> faiRecordDataList = getInspectionDetails(partAttribute.get(0), data);
             // 新增FQC明细记录信息
-            qcMapper.saveFQCDetailedRecords(faiRecordDataList);
+            for (QcFAIRecordData recordData : faiRecordDataList) {
+                qcMapper.saveFQCDetailedRecord(recordData);
+            }
+            //qcMapper.saveFQCDetailedRecords(faiRecordDataList);
         } else {
             // 明细记录信息赋值
             String partNo = data.getPartNo();
@@ -1967,7 +1979,10 @@ public class QcServiceImpl implements QcService {
                 // 获取检验明细数据
                 List<QcFAIRecordData> faiRecordDataList = getInspectionDetails(partAttribute.get(0), data);
                 // 新增FQC明细记录信息
-                qcMapper.saveFQCDetailedRecords(faiRecordDataList);
+                for (QcFAIRecordData recordData : faiRecordDataList) {
+                    qcMapper.saveFQCDetailedRecord(recordData);
+                }
+                //qcMapper.saveFQCDetailedRecords(faiRecordDataList);
             } else {
                 // 获取物料的类别编码
                 String familyId = qcMapper.selectFamilyIdByPartNo(partNo,data.getSite());
@@ -1985,7 +2000,10 @@ public class QcServiceImpl implements QcService {
                     // 获取检验明细数据
                     List<QcFAIRecordData> faiRecordDataList = getInspectionDetails(familyAttribute.get(0), data);
                     // 新增FQC明细记录信息
-                    qcMapper.saveFQCDetailedRecords(faiRecordDataList);
+                    for (QcFAIRecordData recordData : faiRecordDataList) {
+                        qcMapper.saveFQCDetailedRecord(recordData);
+                    }
+                    //qcMapper.saveFQCDetailedRecords(faiRecordDataList);
                 }
             }
         }
@@ -2283,7 +2301,10 @@ public class QcServiceImpl implements QcService {
             // 获取检验明细数据
             List<QcFAIRecordData> faiRecordDataList = getInspectionDetails(partAttribute.get(0), data);
             // 新增IPQC明细记录信息
-            qcMapper.saveIPQCDetailedRecords(faiRecordDataList);
+            for (QcFAIRecordData recordData : faiRecordDataList) {
+                qcMapper.saveIPQCDetailedRecord(recordData);
+            }
+            //qcMapper.saveIPQCDetailedRecords(faiRecordDataList);
         } else { // 动控未开启
             // 明细记录信息赋值
             String partNo = data.getPartNo();
@@ -2309,7 +2330,10 @@ public class QcServiceImpl implements QcService {
                 // 获取检验明细数据
                 List<QcFAIRecordData> faiRecordDataList = getInspectionDetails(partAttribute.get(0), data);
                 // 新增IPQC明细记录信息
-                qcMapper.saveIPQCDetailedRecords(faiRecordDataList);
+                for (QcFAIRecordData recordData : faiRecordDataList) {
+                    qcMapper.saveIPQCDetailedRecord(recordData);
+                }
+                //qcMapper.saveIPQCDetailedRecords(faiRecordDataList);
             } else {
                 // 获取物料的类别编码
                 String familyId = qcMapper.selectFamilyIdByPartNo(partNo,data.getSite());
@@ -2327,7 +2351,10 @@ public class QcServiceImpl implements QcService {
                     // 获取检验明细数据
                     List<QcFAIRecordData> faiRecordDataList = getInspectionDetails(familyAttribute.get(0), data);
                     // 新增IPQC明细记录信息
-                    qcMapper.saveIPQCDetailedRecords(faiRecordDataList);
+                    for (QcFAIRecordData recordData : faiRecordDataList) {
+                        qcMapper.saveIPQCDetailedRecord(recordData);
+                    }
+                    //qcMapper.saveIPQCDetailedRecords(faiRecordDataList);
                 }
             }
         }

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

@@ -1584,6 +1584,17 @@
         VALUES(#{inspectionNo}, #{site}, #{buNo}, #{state}, getDate(), #{inspectionTypeNo}, #{inspectionCycle,jdbcType=DECIMAL}, #{orderNo}, #{operationDesc}, #{resourceId}, #{partNo}, #{rollQty}, #{samplingQty,jdbcType=DECIMAL}, #{ssrId}, #{seqNo}, #{batchRollNo}, #{specialRequirements}, #{workCenterNo}, #{rollNo}, #{umId})
     </insert>
 
+    <insert id="saveFAIDetailedRecord" parameterType="com.xujie.sys.modules.pms.data.QcFAIRecordData">
+        INSERT INTO qc_fai_detailed_record
+        (inspection_no, order_no, template_id, sampling_level_no, sampling_level_desc, sampling_programme_no, sampling_programme_desc,
+         AQL, AC, RE, item_no, item_desc, object_id, object_desc, default_value, min_value,
+         max_value, value_type_db, value_type, site, sampling_qty, bu_no,order_id)
+        VALUES
+        (#{inspectionNo}, #{orderNo}, #{templateId}, #{samplingLevelNo}, #{samplingLevelDesc}, #{samplingProgrammeNo}, #{samplingProgrammeDesc},
+         #{aql,jdbcType=DECIMAL}, #{ac,jdbcType=DECIMAL}, #{re,jdbcType=DECIMAL}, #{itemNo}, #{itemDesc}, #{objectId}, #{objectDesc}, #{defaultValue}, #{minValue,jdbcType=DECIMAL},
+         #{maxValue,jdbcType=DECIMAL}, #{valueTypeDb}, #{valueType}, #{site}, #{samplingQty,jdbcType=DECIMAL}, #{buNo},#{orderId,jdbcType=INTEGER})
+    </insert>
+
     <!-- 新增FAI明细记录信息 -->
     <insert id="saveFAIDetailedRecords">
         INSERT INTO qc_fai_detailed_record
@@ -1933,6 +1944,17 @@
         }
     </select>
 
+    <insert id="saveIPQCDetailedRecord" parameterType="com.xujie.sys.modules.pms.data.QcFAIRecordData">
+        INSERT INTO qc_ipqc_detailed_record
+        (inspection_no, order_no, template_id, sampling_level_no, sampling_level_desc, sampling_programme_no, sampling_programme_desc,
+         AQL, AC, RE, item_no, item_desc, object_id, object_desc, default_value, min_value,
+         max_value, value_type_db, value_type, site, sampling_qty, bu_no,order_id)
+        VALUES
+        (#{inspectionNo}, #{orderNo}, #{templateId}, #{samplingLevelNo}, #{samplingLevelDesc}, #{samplingProgrammeNo}, #{samplingProgrammeDesc},
+         #{aql,jdbcType=DECIMAL}, #{ac,jdbcType=DECIMAL}, #{re,jdbcType=DECIMAL}, #{itemNo}, #{itemDesc}, #{objectId}, #{objectDesc}, #{defaultValue}, #{minValue,jdbcType=DECIMAL},
+         #{maxValue,jdbcType=DECIMAL}, #{valueTypeDb}, #{valueType}, #{site}, #{samplingQty,jdbcType=DECIMAL}, #{buNo},#{orderId,jdbcType=INTEGER})
+    </insert>
+
     <!-- 新增IPQC明细记录信息 -->
     <insert id="saveIPQCDetailedRecords">
         INSERT INTO qc_ipqc_detailed_record
@@ -2830,6 +2852,17 @@
         END, a.task_date desc
     </select>
 
+    <insert id="saveFQCDetailedRecord" parameterType="com.xujie.sys.modules.pms.data.QcFAIRecordData">
+        INSERT INTO qc_fqc_detailed_record
+        (inspection_no, order_no, template_id, sampling_level_no, sampling_level_desc, sampling_programme_no, sampling_programme_desc,
+         AQL, AC, RE, item_no, item_desc, object_id, object_desc, default_value, min_value,
+         max_value, value_type_db, value_type, site, sampling_qty, bu_no,order_id)
+        VALUES
+        (#{inspectionNo}, #{orderNo}, #{templateId}, #{samplingLevelNo}, #{samplingLevelDesc}, #{samplingProgrammeNo}, #{samplingProgrammeDesc},
+         #{aql,jdbcType=DECIMAL}, #{ac,jdbcType=DECIMAL}, #{re,jdbcType=DECIMAL}, #{itemNo}, #{itemDesc}, #{objectId}, #{objectDesc}, #{defaultValue}, #{minValue,jdbcType=DECIMAL},
+         #{maxValue,jdbcType=DECIMAL}, #{valueTypeDb}, #{valueType}, #{site}, #{samplingQty,jdbcType=DECIMAL}, #{buNo},#{orderId,jdbcType=INTEGER})
+    </insert>
+
     <!-- 新增FQC明细记录信息 -->
     <insert id="saveFQCDetailedRecords">
         INSERT INTO qc_fqc_detailed_record