From d75d7d7d76fe16e133f793cc31bfaea17a10cd24 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 27 十一月 2023 13:39:59 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java | 152 ++++++++++++++++++++++----------------------------
1 files changed, 66 insertions(+), 86 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 3810150..30e8ff6 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,45 +1,63 @@
package com.example.springboot.entity;
+
+
public class StorageCage {
private Integer id;
+ private Integer prcId;
private String glassId;
-<<<<<<< HEAD
private Integer cage;
private Integer cell;
private Double width;
private Double glasswidth;
private Double glassheight;
private String state;
- private Integer tier;
+ private Integer tier;
private String orderId;
-=======
- private String orderid;
- private String cage;
- private String cell;
- private String width;
- private String state;
- private String tier;
- private Double glasswidth;
- private Double glassheight;
->>>>>>> 7870c2d4fd6da5269a87f53d584a36628fd8ef12
+ private Integer disabled;
+ private String lengthWidth;
+ private String listno;
+ private String boxno;
+
+ private north_glass_buffer1 north_glass_buffer1s;
+
+ 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;
}
-<<<<<<< HEAD
- public void setId(Integer id) {
- this.id = id;
- }
-=======
public void setId(Integer id) {
this.id = id;
}
->>>>>>> 7870c2d4fd6da5269a87f53d584a36628fd8ef12
public Integer getId() {
return id;
}
+ public Integer getPrcId() {
+ return prcId;
+ }
+
+ public void setPrcId(Integer prcId) {
+ this.prcId = prcId;
+ }
+
public String getGlassId() {
return glassId;
@@ -48,15 +66,15 @@
public void setGlassId(String glassId) {
this.glassId = glassId;
}
-<<<<<<< HEAD
- public String getOrderId() {
+
+ public String getOrderId() {
return orderId;
}
public void setOrderId(String orderId) {
this.orderId = orderId;
}
-
+
public Integer getCage() {
return cage;
}
@@ -73,16 +91,6 @@
return cell;
}
-
-
- // public String getHeighth() {
- // return height;
- // }
-
- // public void setHeight(String height) {
- // this.height = height;
- // }
-
public Double getWidth() {
return width;
}
@@ -91,43 +99,7 @@
this.width = width;
}
- public String getState() {
-=======
-
- public String getOrderId() {
- return orderid;
- }
-
- public void setOrderId(String orderid) {
- this.orderid = orderid;
- }
-
- public String getCage() {
- return cage;
- }
-
- public void setGage(String cage) {
- this.cage = cage;
- }
-
- public void setCell(String cell) {
- this.cell = cell;
- }
-
- public String getCell() {
- return cell;
- }
-
- public String getWidth() {
- return width;
- }
-
- public void setWidth(String width) {
- this.width = width;
- }
-
public String getState() {
->>>>>>> 7870c2d4fd6da5269a87f53d584a36628fd8ef12
return state;
}
@@ -135,53 +107,61 @@
this.state = state;
}
-<<<<<<< HEAD
- public Integer getTier() {
+ public Integer getTier() {
return tier;
}
public void setTier(Integer tier) {
this.tier = tier;
}
- public Double getGlassWidth() {
+
+ 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 String getTier() {
- return tier;
+
+ public Integer getDisabled() {
+ return disabled;
}
- public void setTier(String tier) {
- this.tier = tier;
+ public void setDisabled(Integer disabled) {
+ this.disabled = disabled;
}
- public Double getglasswidth() {
- return glasswidth;
+ public String getLengthWidth() {
+ return lengthWidth;
}
- public void setglasswidth(Double glasswidth) {
- this.glasswidth = glasswidth;
+ public void setLengthWidth(String lengthWidth) {
+ this.lengthWidth = lengthWidth;
}
- public Double getglassheight() {
- return glassheight;
+ public String getListno() {
+ return listno;
}
- public void setglassheight(Double glassheight) {
- this.glassheight = glassheight;
+ public void setListno(String listno) {
+ this.listno = listno;
}
->>>>>>> 7870c2d4fd6da5269a87f53d584a36628fd8ef12
+ public String getBoxno() {
+ return boxno;
+ }
+
+ public void setBoxno(String boxno) {
+ this.boxno = boxno;
+ }
+
+
}
--
Gitblit v1.8.0