Browse Source

指导文件 编辑 未生效 携带文件id

daili 3 years ago
parent
commit
7b9ba5144b

+ 4 - 1
application-facade/src/main/java/com/factory/web/entity/fa/req/EditFaPlanReq.java

@@ -66,9 +66,12 @@ public class EditFaPlanReq {
     @ApiModelProperty(value = "200件最晚提交时间")
     private String twoHundredSubmitTime;
 
-    @ApiModelProperty(value="首件、200件、中断类型")
+    @ApiModelProperty(value = "首件、200件、中断类型")
     private String typeFlag;
 
+    @ApiModelProperty(value = "首件、200件、中断类型")
+    private Integer url;
+
     @ApiModelProperty(value = "表头信息")
     private FirstArticleTitle firstArticleTitle;
 

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

@@ -436,6 +436,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
                         .prevId(oldPlan.getId())
                         .originalId(oldPlan.getOriginalId())
                         .status(PlanStatus.WAIT_APPROVAL.value)
+                        .fileId(req.getUrl())
                         .build();
                 planService.save(plan);
                 // 添加首件、200件点检规则
@@ -496,12 +497,13 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
                     }
                 }
             } else {
-                // 没审批通过 修改防错计划
+                // 没审批通过 修改计划
                 plan = BentelerPlan.builder()
                         .id(oldPlan.getId())
                         .name(req.getBentelerPlanName())
                         .effectiveDate(req.getEffectiveDate())
                         .status(PlanStatus.WAIT_APPROVAL.value)
+                        .fileId(req.getUrl())
                         .build();
                 planService.updateById(plan);
                 // 删除首件、200件点检规则