hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCage.java
@@ -3,6 +3,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -17,6 +19,7 @@ * @author zhoush * @since 2024-03-27 */ @ApiModel(description = "<p> 大理片笼 </p>") @Data @EqualsAndHashCode(callSuper = false) public class BigStorageCage implements Serializable { @@ -26,29 +29,35 @@ /** * 大理片笼表id */ @ApiModelProperty(value = "大理片笼表id", position = 2) @TableId(value = "id", type = IdType.AUTO) private Integer id; /** * 设备id */ @ApiModelProperty(value = "设备id", position = 3) private Integer deviceId; /** * 栅格号 */ @ApiModelProperty(value = "栅格号", position = 4) private Integer slot; /** * 启用状态 */ @ApiModelProperty(value = "启用状态", position = 5) private String enableState; /** * 剩余宽度 */ @ApiModelProperty(value = "剩余宽度", position = 6) private Integer remainWidth; @ApiModelProperty(hidden = true) @TableField(exist = false) private List<BigStorageCageDetails> bigStorageCageDetails; hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.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 BigStorageCageDetails implements Serializable { @@ -23,72 +27,86 @@ /** * 大理片笼详情表id */ @ApiModelProperty(value = "大理片笼详情表id", position = 2) @TableId(value = "id", type = IdType.AUTO) private Long id; /** * 设备id */ @ApiModelProperty(value = "设备id", position = 3) private Integer deviceId; /** * 栅格号 */ @ApiModelProperty(value = "栅格号", position = 4) private Integer slot; /** * 玻璃id */ @ApiModelProperty(value = "玻璃id", position = 5) private String glassId; /** * 小片在格内的顺序 */ @ApiModelProperty(value = "小片在格内的顺序", position = 6) private Integer sequence; /** * 流程卡号 */ @ApiModelProperty(value = "流程卡号", position = 7) private String flowCardId; /** * 玻璃类型 */ @ApiModelProperty(value = "玻璃类型", position = 8) private Integer glassType; /** * 宽 */ @ApiModelProperty(value = "宽", position = 9) private Double width; /** * 高 */ @ApiModelProperty(value = "高", position = 10) private Double height; /** * 厚度 */ @ApiModelProperty(value = "厚度", position = 11) private Double thickness; /** * 钢化版图id */ @ApiModelProperty(value = "钢化版图id", position = 12) private Integer temperingLayoutId; /** * 钢化版图片序 */ @ApiModelProperty(value = "钢化版图片序", position = 13) private Integer temperingFeedSequence; /** * 状态 */ @ApiModelProperty(value = "状态", position = 14) private Integer state; /** * 玻璃间隙 */ @ApiModelProperty(value = "玻璃间隙", position = 15) private Integer gap; hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageFeedTaskServiceImpl.java
@@ -38,7 +38,7 @@ @Override public List<BigStorageCageFeedTask> querybigStorageCageFeedTask(int taskState){ LambdaQueryWrapper<BigStorageCageFeedTask> getFeedTaskWrapper=new LambdaQueryWrapper<>(); getFeedTaskWrapper.eq(BigStorageCageFeedTask::getTaskState,1); getFeedTaskWrapper.eq(BigStorageCageFeedTask::getTaskState,taskState); return baseMapper.selectList(getFeedTaskWrapper); } }