Browse Source

首件-接口

wuzhenyue 3 years ago
parent
commit
29c755e20c

+ 38 - 0
application-facade/src/main/java/com/factory/web/entity/pm/res/AbnormalItemRes.java

@@ -0,0 +1,38 @@
+package com.factory.web.entity.pm.res;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+import javax.validation.constraints.NotEmpty;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.factory.web.entity.pm.OnsiteWorkshop;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 防错计划
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude()
+@ApiModel("")
+public class AbnormalItemRes implements Serializable {
+	
+	@ApiModelProperty(value = "巡检项目id")
+	private Long onsiteItemId;
+
+}

+ 71 - 0
application-facade/src/main/java/com/factory/web/entity/pm/res/AbnormalTaskInfoRes.java

@@ -0,0 +1,71 @@
+package com.factory.web.entity.pm.res;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+import javax.validation.constraints.NotEmpty;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.factory.web.entity.pm.OnsiteWorkshop;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 防错计划
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude()
+@ApiModel("")
+public class AbnormalTaskInfoRes implements Serializable {
+	
+	@ApiModelProperty(value = "计划Id")
+	private Long bentelerPlanId;
+
+	@ApiModelProperty(value = "计划名称")
+	private String bentelerPlanName;
+	
+	@ApiModelProperty(value = "计划类型 1首件 2防错")
+    private Integer planType;
+	
+	@ApiModelProperty(value = "1质量工程师审批 2质量经理审批")
+	private Integer approvalLevel;
+	
+	@ApiModelProperty(value = "放行:操作人;重检:操作人")
+	private String person;
+	
+	@ApiModelProperty(value = "1放行 2重检")
+	private Integer method;
+	
+	@ApiModelProperty(value = "审批意见")
+	private String reason;
+
+    @ApiModelProperty(value = "审批时间")
+    private LocalDateTime updatedTime;
+	
+    @ApiModelProperty(value = "0初始化 1待审核状态 2放行 3不通过 4通过")
+	private Integer status;
+    
+    @ApiModelProperty(value = "首件:0表示首件 1表示200件 2表示中断;防错:0日巡检  1周巡检  2月巡检")
+	private Integer typeFlag;
+    
+    @ApiModelProperty(value = "任务id")
+	private Long taskId;
+
+	@ApiModelProperty(value = "工作站")
+	private List<AbnormalWorkshopRes> abnormalWorkshopList;
+
+}

+ 44 - 0
application-facade/src/main/java/com/factory/web/entity/pm/res/AbnormalWorkshopRes.java

@@ -0,0 +1,44 @@
+package com.factory.web.entity.pm.res;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+import javax.validation.constraints.NotEmpty;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.factory.web.entity.pm.OnsiteWorkshop;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 防错计划
+ *
+ * @author wzy
+ * @date 2021-07-09 12:00:00
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude()
+@ApiModel("")
+public class AbnormalWorkshopRes implements Serializable {
+	
+	@ApiModelProperty(value = "工作站id")
+	private Long workshopId;
+	
+	@ApiModelProperty(value = "工作站名称")
+	private String wsName;
+
+	@ApiModelProperty(value = "巡检项及检查结果")
+	private List<AbnormalItemRes> abnormalItemList;
+
+}