重检和普通的提交区分开

application-facade/src/main/java/com/factory/web/entity/fa/req/SubmitFaTaskReq.java

@@ -34,5 +34,8 @@ public class SubmitFaTaskReq {
 
     @ApiModelProperty(value = "点检人对应的用户ID")
     private Long userId;
+    
+    @ApiModelProperty(value = "是否重检")
+    private Boolean recheckFlag;
 
 }

application-facade/src/main/java/com/factory/web/entity/pm/req/SearchTaskReq.java

@@ -25,4 +25,6 @@ public class SearchTaskReq {
     @ApiModelProperty(value = "任务id")
     private Long onsiteTaskId;
 
+    @ApiModelProperty(value = "是否重检")
+    private Boolean recheckFlag;
 }

application-facade/src/main/java/com/factory/web/service/impl/fa/FirstArticleServiceImpl.java

@@ -868,6 +868,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
         searchFaTaskInfoReq.setTaskId(req.getTaskId());
         
         FirstArticleTask faTaskInfo = this.getFaTaskInfo(searchFaTaskInfoReq);
+       
         long firstArticleTaskId = 0;
         if (req.getTypeFlag() == 0 || req.getTypeFlag() == 1) { // 0表示首件 1表示200件
             if (faTaskInfo == null) {
@@ -887,7 +888,9 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
                 firstArticleTaskId = faTaskInfo.getId();
             }
         }
-
+        if(faTaskInfo.getStatus()==3&&!req.getRecheckFlag()) {
+        	return ResponseBeanBuilder.fail("请在重检列表中操作重检任务");
+        }
         /* 取得task下的所有条目检查结果 */
         List<FirstArticleItemResult> firstArticleItemResultList = firstArticleItemResultService.list(Wrappers.<FirstArticleItemResult>lambdaQuery()
                 .eq(FirstArticleItemResult::getFirstArticleTaskId, firstArticleTaskId));

application-facade/src/main/java/com/factory/web/service/impl/pm/PreventMistakeServiceImpl.java

@@ -890,6 +890,14 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 		List<OnsiteItemResult> onsiteItemResultList = onsiteItemResultService.list(Wrappers.<OnsiteItemResult>lambdaQuery()
                 .eq(OnsiteItemResult::getOnsiteTaskId, req.getOnsiteTaskId()));
 
+		 OnsiteTask task = onsiteTaskService.getById(req.getOnsiteTaskId());
+		 if(task==null) {
+			 return ResponseBeanBuilder.fail("计划任务不存在！");
+		 } else if(task.getStatus()==2||task.getStatus()==4) {
+			 return ResponseBeanBuilder.fail("该计划任务已处理！无需重复提交！");
+		 } else if(task.getStatus()==3&&!req.getRecheckFlag()) {
+			 return ResponseBeanBuilder.fail("请在重检列表中操作重检任务");
+		 }
         /* task提交时，备份result异常信息到resultBak */
         for (OnsiteItemResult onsiteItemResult : onsiteItemResultList) {
         	if(onsiteItemResult.getResult()==1) {