From 8603212f565621710b9782d2d798e66334e7733b Mon Sep 17 00:00:00 2001 From: 严智鑫 <test> Date: 星期二, 12 三月 2024 15:41:53 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/Albania_Mes --- springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java | 256 ++++++++++++++++----------------------------------- 1 files changed, 81 insertions(+), 175 deletions(-) diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java b/springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java index 61a0b59..c9a594f 100644 --- a/springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java +++ b/springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java @@ -1,182 +1,88 @@ package com.example.springboot.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import lombok.Data; + //鐞嗙墖绗艰〃 +/** + * 瀛樺偍绗煎瓙琛� + */ +@Data +@TableName("storage_cage") public class StorageCage { - private Integer id; //鑷簭id - private Integer prcId;//plcid - private String glassId;//鐜荤拑id - private Integer cage;//绗煎瓙鍙� - private Integer cell;//鏍煎瓙鍙� - private Double width;//鏍煎瓙瀹� - private Double glasswidth;//鐜荤拑瀹� - private Double glassheight;//鐜荤拑楂� - private Double glasswidthmm;//鑻卞鐜荤拑瀹� - private Double glassheightmm;//鑻卞鐜荤拑楂� - private String state;//鐘舵�� - private Integer tier;//鍐呭鐗� - private String orderId;//璁㈠崟id - private Integer disabled;//鍋滅敤 - private String listId;//闆嗗悎id - private String boxId;//绠卞瓙id - private String FrameBarcode;//閾濇id; - private north_glass_buffer1 north_glass_buffer1s; + /** + * 涓婚敭锛岃嚜鍔ㄧ敓鎴� + */ + @TableId(value = "id", type = IdType.AUTO) + private Integer id; - public void setnorth_glass_buffer1s(north_glass_buffer1 north_glass_buffer1s) { - this.north_glass_buffer1s = north_glass_buffer1s; - } - - public north_glass_buffer1 getnorth_glass_buffer1s() { - return north_glass_buffer1s; - } - - private Out_slice outSlice; - - public void setout_slice(Out_slice outSlice) { - this.outSlice = outSlice; - } - - public Out_slice getout_slice() { - return outSlice; - } - - public Integer id() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Integer getId() { - return id; - } - - public Integer getPrcId() { - return prcId; - } - - public void setPrcId(Integer prcId) { - this.prcId = prcId; - } - - public String getGlassId() { - return glassId; - } - - public void setGlassId(String glassId) { - this.glassId = glassId; - } - - public String getOrderId() { - return orderId; - } - - public void setOrderId(String orderId) { - this.orderId = orderId; - } - - public Integer getCage() { - return cage; - } - - public void setGage(Integer cage) { - this.cage = cage; - } - - public void setCell(Integer cell) { - this.cell = cell; - } - - public Integer getCell() { - return cell; - } - - public Double getWidth() { - return width; - } - - public void setWidth(Double width) { - this.width = width; - } - - public String getState() { - return state; - } - - public void setState(String state) { - this.state = state; - } - - public Integer getTier() { - return tier; - } - - public void setTier(Integer tier) { - this.tier = tier; - } - - public Double getGlassWidth() { - return glasswidth; - } - - public void setGlassWidth(Double glasswidth) { - this.glasswidth = glasswidth; - } - - public Double getGlassHeight() { - return glassheight; - } - - public void setGlassHeight(Double glassheight) { - this.glassheight = glassheight; - } - - public Double getGlassWidthMm() { - return glasswidthmm; - } - - public void setGlassWidthMm(Double glasswidthmm) { - this.glasswidthmm = glasswidthmm; - } - - public Double getGlassHeightMm() { - return glassheightmm; - } - - public void setGlassHeightMm(Double glassheightmm) { - this.glassheightmm = glassheightmm; - } - - public Integer getDisabled() { - return disabled; - } - - public void setDisabled(Integer disabled) { - this.disabled = disabled; - } - - public String getListId() { - return listId; - } - - public void setListno(String listId) { - this.listId = listId; - } - - public String getBoxId() { - return boxId; - } - - public void setBoxno(String boxId) { - this.boxId = boxId; - } - - public String getFrameBarcode() { - return FrameBarcode; - } - - public void setFrameBarcode(String FrameBarcode) { - this.FrameBarcode = FrameBarcode; - } + /** + * 鐜荤拑id + */ + private String glassId; + /** + * 娴佺▼鍗� + */ + private String flowcard; + /** + * 绗煎瓙id + */ + private Integer cage; + /** + * 鏍煎瓙id + */ + private Integer cell; + /** + * 鏍煎瓙灞俰d + */ + private Integer tier; + /** + * 鏍煎瓙瀹� + */ + private Double width; + /** + * 鐜荤拑瀹� + */ + private Double glassWidth; + /** + * 鐜荤拑楂� + */ + private Double glassHeight; + /** + * 娴嬮噺瀹� + */ + private Double glassWidthMm; + /** + * 娴嬮噺楂� + */ + private Double glassHeightMm; + /** + * 缂栧彿 + */ + private String thickness; + /** + * 绠卞瓙鍙� + */ + private String films; + /** + * 鐘舵�侊紙0锛氭棤鐜荤拑锛�1锛氭湁鐜荤拑锛�2锛氳繘鐗囦腑锛�3锛氬嚭鐗囦腑锛�4锛氳皟搴︿腑锛� + */ + private Integer state; + /** + * 鏍煎瓙鐘舵�侊紙0锛氬惎鐢紝1锛氱鐢級 + */ + private Integer disabled; + /** + * 鐜荤拑绫诲瀷 + */ + private String glasstype; + /** + * 鐜荤拑鏁伴噺 + */ + private Integer number; } -- Gitblit v1.8.0