hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/entity/BigStorageCageFeedTask.java
@@ -3,6 +3,9 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -14,21 +17,43 @@ * @author zhoush * @since 2024-04-16 */ @ApiModel(description = "<p> 进片任务 </p>") @Data @EqualsAndHashCode(callSuper = false) public class BigStorageCageFeedTask implements Serializable { private static final long serialVersionUID = 1L; /** * 进片任务id */ @ApiModelProperty(value = "进片任务id", position = 2) @TableId(value = "id", type = IdType.AUTO) private Long id; /** * 目标格子 */ @ApiModelProperty(value = "目标格子", position = 3) private Integer tragetSlot; /** * 任务类型 */ @ApiModelProperty(value = "任务类型", position = 4) private Integer taskType; /** * 进片状态 */ @ApiModelProperty(value = "进片状态", position = 5) private Integer taskState; /** * 线路 */ @ApiModelProperty(value = "线路", position = 6) private Integer line; hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/entity/BigStorageCageOutTask.java
@@ -3,6 +3,9 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -14,23 +17,46 @@ * @author zhoush * @since 2024-04-16 */ @ApiModel(description = "<p> 出片任务 </p>") @Data @EqualsAndHashCode(callSuper = false) public class BigStorageCageOutTask implements Serializable { private static final long serialVersionUID = 1L; /** * 出片任务id */ @ApiModelProperty(value = "出片任务id", position = 2) @TableId(value = "id", type = IdType.AUTO) private Long id; /** * 开始位置 */ @ApiModelProperty(value = "开始位置", position = 3) private Integer startSlot; /** * 目标位置 */ @ApiModelProperty(value = "目标位置", position = 4) private Integer endSlot; /** * 车次 */ @ApiModelProperty(value = "车次", position = 5) private Integer trainNumber; /** * 片序 */ @ApiModelProperty(value = "片序", position = 6) private Integer serialNumber; /** * 任务类型 */ @ApiModelProperty(value = "任务类型", position = 7) private Integer taskState; hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgstoragetask/entity/TaskCache.java
@@ -2,6 +2,9 @@ import com.baomidou.mybatisplus.annotation.TableId; import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,6 +16,7 @@ * @author zhoush * @since 2024-04-16 */ @ApiModel(description = "<p> 磨边任务 </p>") @Data @EqualsAndHashCode(callSuper = false) public class TaskCache implements Serializable { @@ -22,27 +26,32 @@ /** * ID编号 */ @ApiModelProperty(value = "ID编号", position = 2) @TableId("ID") private Long id; /** * 起始 */ @ApiModelProperty(value = "起始", position = 3) private String startCell; /** * 目标 */ @ApiModelProperty(value = "目标", position = 4) private String endCell; /** * 任务类型 1:进 2:出 */ @ApiModelProperty(value = "任务类型 1:进 2:出", position = 5) private String taskType; /** * 任务状态 0 未开始 1已完成 */ @ApiModelProperty(value = "任务状态 0 未开始 1已完成", position = 6) private String taskStauts; hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java
@@ -3,6 +3,9 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -14,6 +17,7 @@ * @author zhoush * @since 2024-03-27 */ @ApiModel(description = "<p> 钢化小片信息 </p>") @Data @EqualsAndHashCode(callSuper = false) public class TemperingGlassInfo implements Serializable { @@ -23,72 +27,86 @@ /** * 钢化小片信息表id */ @ApiModelProperty(value = "钢化小片信息表id", position = 2) @TableId(value = "id", type = IdType.AUTO) private Long id; /** * 流程卡 */ @ApiModelProperty(value = "流程卡", position = 3) private String flowcardId; /** * 流程卡玻璃类型 */ @ApiModelProperty(value = "流程卡玻璃类型", position = 4) private Integer glassType; /** * 宽 */ @ApiModelProperty(value = "宽", position = 5) private Double width; /** * 高 */ @ApiModelProperty(value = "高", position = 6) private Double height; /** * 厚度 */ @ApiModelProperty(value = "厚度", position = 7) private Double thickness; /** * 膜系 */ @ApiModelProperty(value = "膜系", position = 8) private Integer filmsid; /** * 钢化是否接受横放 */ @ApiModelProperty(value = "钢化是否接受横放", position = 9) private Integer ishorizontal; /** * 钢化版图id */ @ApiModelProperty(value = "钢化版图id", position = 10) private Integer temperingLayoutId; /** * 钢化版图片序 */ @ApiModelProperty(value = "钢化版图片序", position = 11) private Integer temperingFeedSequence; /** * x坐标 */ @ApiModelProperty(value = "x坐标", position = 12) private Integer xCoordinate; /** * y坐标 */ @ApiModelProperty(value = "y坐标", position = 13) private Integer yCoordinate; /** * 旋转角度(逆时针) */ @ApiModelProperty(value = "旋转角度(逆时针)", position = 14) private Integer angle; /** * 状态 */ @ApiModelProperty(value = "状态", position = 15) private Integer state;