pqc检测任务修改

nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPqcTaskRecordControllerService.java

@@ -546,6 +546,7 @@ public class QmsPqcTaskRecordControllerService {
                 if (isDetailType(detail, 1)) {
                     // 关键物料拍照
                     QmsPqcTaskRecordRepairSelfVO.MaterialCollectionVO materialVO = new QmsPqcTaskRecordRepairSelfVO.MaterialCollectionVO();
+                    materialVO.setInspectionPointItemId(detail.getInspectionPointItemId());
                     materialVO.setSerialNo(detail.getSelfTestData());
                     materialVO.setBatchNo(detail.getReviewData());
                     materialVO.setFiles(convertToFileVO(parseFileList(detail.getSelfTestAttachments()), 
@@ -556,6 +557,7 @@ public class QmsPqcTaskRecordControllerService {
                 } else if (isDetailType(detail, 0)) {
                     // 工序检查
                     QmsPqcTaskRecordRepairSelfVO.ProcessInspectionVO processVO = new QmsPqcTaskRecordRepairSelfVO.ProcessInspectionVO();
+                    processVO.setInspectionPointItemId(detail.getInspectionPointItemId());
                     processVO.setInspectionContent(item.getInspectionContent());
                     processVO.setInspectionMethods(item.getInspectionMethods());
                     processVO.setInspectionLevel(item.getInspectionLevel());
@@ -574,6 +576,7 @@ public class QmsPqcTaskRecordControllerService {
         vo.setTaskNo(taskRecord.getTaskNo());
         vo.setStepName(point.getStepName());
         vo.setInspectionPointName(point.getInspectionPointName());
+        vo.setInspectionPointId(taskRecord.getInspectionPointId());
         vo.setAufnr(taskRecord.getAufnr());
         vo.setRuleVersion(rule != null ? rule.getRuleVersion() : null);
         vo.setNo(taskRecord.getNo());
@@ -638,6 +641,7 @@ public class QmsPqcTaskRecordControllerService {
             if (isDetailType(detail, 1)) {
                 // 关键物料拍照
                 QmsPqcTaskRecordReviewVO.MaterialCollectionVO materialVO = new QmsPqcTaskRecordReviewVO.MaterialCollectionVO();
+                materialVO.setInspectionPointItemId(detail.getInspectionPointItemId());
                 materialVO.setSerialNo(detail.getSelfTestData());
                 materialVO.setBatchNo(detail.getReviewData());
                 materialVO.setFiles(convertToFileVO(parseFileList(detail.getSelfTestAttachments()), 
@@ -654,6 +658,7 @@ public class QmsPqcTaskRecordControllerService {
                 if (isSelfInspectionLevel(item)) {
                     // 星级1和2：复核用
                     QmsPqcTaskRecordReviewVO.ProcessInspectionVO processVO = new QmsPqcTaskRecordReviewVO.ProcessInspectionVO();
+                    processVO.setInspectionPointItemId(detail.getInspectionPointItemId());
                     processVO.setInspectionContent(item.getInspectionContent());
                     processVO.setInspectionMethods(item.getInspectionMethods());
                     processVO.setInspectionLevel(item.getInspectionLevel());
@@ -671,6 +676,7 @@ public class QmsPqcTaskRecordControllerService {
                 } else if (isQcInspectionLevel(item)) {
                     // 星级3：检测用
                     QmsPqcTaskRecordReviewVO.ProcessInspectionLevel3VO processVO = new QmsPqcTaskRecordReviewVO.ProcessInspectionLevel3VO();
+                    processVO.setInspectionPointItemId(detail.getInspectionPointItemId());
                     processVO.setInspectionContent(item.getInspectionContent());
                     processVO.setInspectionMethods(item.getInspectionMethods());
                     processVO.setInspectionLevel(item.getInspectionLevel());
@@ -692,6 +698,7 @@ public class QmsPqcTaskRecordControllerService {
         vo.setTaskNo(taskRecord.getTaskNo());
         vo.setStepName(point.getStepName());
         vo.setInspectionPointName(point.getInspectionPointName());
+        vo.setInspectionPointId(taskRecord.getInspectionPointId());
         vo.setAufnr(taskRecord.getAufnr());
         vo.setRuleVersion(rule != null ? rule.getRuleVersion() : null);
         vo.setNo(taskRecord.getNo());

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPqcTaskRecordRepairSelfVO.java

@@ -26,6 +26,11 @@ public class QmsPqcTaskRecordRepairSelfVO {
      */
     private String inspectionPointName;
 
+    /**
+     * 检查点ID
+     */
+    private Long inspectionPointId;
+
     /**
      * 生产订单号
      */
@@ -74,6 +79,11 @@ public class QmsPqcTaskRecordRepairSelfVO {
         /**
          * 序列号
          */
+        /**
+         * 检测项ID
+         */
+        private Long inspectionPointItemId;
+
         private String serialNo;
 
         /**
@@ -105,6 +115,11 @@ public class QmsPqcTaskRecordRepairSelfVO {
         /**
          * 检查内容
          */
+        /**
+         * 检测项ID
+         */
+        private Long inspectionPointItemId;
+
         private String inspectionContent;
 
         /**

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsPqcTaskRecordReviewVO.java

@@ -26,6 +26,11 @@ public class QmsPqcTaskRecordReviewVO {
      */
     private String inspectionPointName;
 
+    /**
+     * 检查点ID
+     */
+    private Long inspectionPointId;
+
     /**
      * 生产订单号
      */
@@ -84,6 +89,11 @@ public class QmsPqcTaskRecordReviewVO {
         /**
          * 序列号
          */
+        /**
+         * 检测项ID
+         */
+        private Long inspectionPointItemId;
+
         private String serialNo;
 
         /**
@@ -115,6 +125,11 @@ public class QmsPqcTaskRecordReviewVO {
         /**
          * 检查内容
          */
+        /**
+         * 检测项ID
+         */
+        private Long inspectionPointItemId;
+
         private String inspectionContent;
 
         /**
@@ -176,6 +191,11 @@ public class QmsPqcTaskRecordReviewVO {
         /**
          * 检查内容
          */
+        /**
+         * 检测项ID
+         */
+        private Long inspectionPointItemId;
+
         private String inspectionContent;
 
         /**