首件、防错-接口-添加班次

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

@@ -52,5 +52,8 @@ public class FirstArticleCalendar implements Serializable {
 	
 	@ApiModelProperty(value = "0表示首件 1表示200件 2表示中断")
 	private Integer typeFlag;
+	
+	@ApiModelProperty(value = "班次")
+	private String shift;
 
 }

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

@@ -38,7 +38,7 @@ public class AddFaPlanReq {
 	@ApiModelProperty(value = "生效日期", example = "2021-06-06")
 	private LocalDate effectiveDate;
 
-	@ApiModelProperty(value = "日周月点检规则")
+	@ApiModelProperty(value = "首件、200件点检规则")
 	private List<FirstArticleCalendarReq> firstArticleCalendarList;
 
 	@ApiModelProperty(value = "表头信息")

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

@@ -41,5 +41,8 @@ public class FirstArticleCalendarReq {
 	
 	@ApiModelProperty(value = "0表示首件 1表示200件")
 	private Integer typeFlag;
+	
+	@ApiModelProperty(value = "班次")
+	private String shift;
 
 }

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

@@ -58,5 +58,8 @@ public class OnsiteCalendar implements Serializable {
 	
 	@ApiModelProperty(value = "0日巡检  1周巡检  2月巡检")
 	private Integer typeFlag;
+	
+	@ApiModelProperty(value = "班次")
+	private String shift;
 
 }

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

@@ -44,5 +44,8 @@ public class OnsiteCalendarReq {
 	
 	@ApiModelProperty(value = "0日巡检  1周巡检  2月巡检")
 	private Integer typeFlag;
+	
+	@ApiModelProperty(value = "班次")
+	private String shift;
 
 }

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

@@ -172,6 +172,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
 					.twoHundredSubmitTime(firstArticleCalendarReq.getTwoHundredSubmitTime())
 					.userId(firstArticleCalendarReq.getUserId())
 					.typeFlag(firstArticleCalendarReq.getTypeFlag())
+					.shift(firstArticleCalendarReq.getShift())
 					.build();
 			firstArticleCalendarService.save(firstArticleCalendar);
 		}
@@ -367,6 +368,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
 					.twoHundredSubmitTime(firstArticleCalendarReq.getTwoHundredSubmitTime())
 					.userId(firstArticleCalendarReq.getUserId())
 					.typeFlag(firstArticleCalendarReq.getTypeFlag())
+                    .shift(firstArticleCalendarReq.getShift())
 					.build();
 			firstArticleCalendarService.save(firstArticleCalendar);
 		}

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

@@ -183,6 +183,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 					.month(onsiteCalendarReq.getMonth())
 					.userId(onsiteCalendarReq.getUserId())
 					.typeFlag(onsiteCalendarReq.getTypeFlag())
+					.shift(onsiteCalendarReq.getShift())
 					.build();
 			onsiteCalendarService.save(onsiteCalendar);
 		}
@@ -491,6 +492,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 					.month(onsiteCalendarReq.getMonth())
 					.userId(onsiteCalendarReq.getUserId())
 					.typeFlag(onsiteCalendarReq.getTypeFlag())
+					.shift(onsiteCalendarReq.getShift())
 					.build();
 			onsiteCalendarService.save(onsiteCalendar);
 		}