From dc7e0180c54cb5576030585983502cb256eeee14 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期四, 20 六月 2024 22:05:39 +0800 Subject: [PATCH] 1、大理片笼进出片任务逻辑初次提交:单元测试已完成,待优化 2、删除重复无用的钢化小片表、玻璃小片表 3、删除玻璃小片mapper层接口多继承无用父类 4、调整按照工程号获取优化详情表内的宽高 --- hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java index ac47c7b..02e9750 100644 --- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java +++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java @@ -2,6 +2,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -13,8 +15,9 @@ * </p> * * @author zhoush - * @since 2024-04-07 + * @since 2024-03-27 */ +@ApiModel(description = "<p> 閽㈠寲灏忕墖淇℃伅琛� </p>") @Data @EqualsAndHashCode(callSuper = false) public class TemperingGlassInfo implements Serializable { @@ -24,72 +27,92 @@ /** * 閽㈠寲灏忕墖淇℃伅琛╥d */ + @ApiModelProperty(value = "閽㈠寲灏忕墖淇℃伅琛╥d", position = 2) @TableId(value = "id", type = IdType.AUTO) private Long id; /** + * 鐜荤拑id + */ + @ApiModelProperty(value = "鐜荤拑id", position = 3) + private String glassId; + + /** * 娴佺▼鍗� */ - private String flowcardId; + @ApiModelProperty(value = "娴佺▼鍗�", position = 4) + private String flowCardId; /** * 娴佺▼鍗$幓鐠冪被鍨� */ + @ApiModelProperty(value = "娴佺▼鍗$幓鐠冪被鍨�", position = 5) private Integer glassType; /** * 瀹� */ + @ApiModelProperty(value = "瀹�", position = 6) private Double width; /** * 楂� */ + @ApiModelProperty(value = "楂�", position = 7) private Double height; /** * 鍘氬害 */ + @ApiModelProperty(value = "鍘氬害", position = 8) private Double thickness; /** * 鑶滅郴 */ + @ApiModelProperty(value = "鑶滅郴", position = 9) private Integer filmsid; /** * 閽㈠寲鏄惁鎺ュ彈妯斁 */ + @ApiModelProperty(value = "閽㈠寲鏄惁鎺ュ彈妯斁", position = 10) private Integer ishorizontal; /** * 閽㈠寲鐗堝浘id */ + @ApiModelProperty(value = "閽㈠寲鐗堝浘id", position = 11) private Integer temperingLayoutId; /** * 閽㈠寲鐗堝浘鐗囧簭 */ + @ApiModelProperty(value = "閽㈠寲鐗堝浘鐗囧簭", position = 12) private Integer temperingFeedSequence; /** * x鍧愭爣 */ + @ApiModelProperty(value = "x鍧愭爣", position = 13) private Integer xCoordinate; /** * y鍧愭爣 */ + @ApiModelProperty(value = "y鍧愭爣", position = 14) private Integer yCoordinate; /** * 鏃嬭浆瑙掑害锛堥�嗘椂閽堬級 */ + @ApiModelProperty(value = "鏃嬭浆瑙掑害锛堥�嗘椂閽堬級", position = 15) private Integer angle; /** * 鐘舵�� */ + @ApiModelProperty(value = "鐘舵��", position = 16) private Integer state; /** * 鏍煎瓙鍙� -- Gitblit v1.8.0