From 58d7b0e12ccd92cf3934f6582b51b5fbcecaa39a Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 09 五月 2024 09:42:41 +0800
Subject: [PATCH] 修改注入方式
---
springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java | 187 ++++++++++++++++++++++------------------------
1 files changed, 91 insertions(+), 96 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..61a0b59 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,44 +1,62 @@
package com.example.springboot.entity;
-
+//鐞嗙墖绗艰〃
public class StorageCage {
- private Integer id;
- 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 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 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;
+
+ 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() {
@@ -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,76 @@
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 Double getGlassWidthMm() {
+ return glasswidthmm;
}
- public void setTier(String tier) {
- this.tier = tier;
+ public void setGlassWidthMm(Double glasswidthmm) {
+ this.glasswidthmm = glasswidthmm;
}
- public Double getglasswidth() {
- return glasswidth;
+ public Double getGlassHeightMm() {
+ return glassheightmm;
}
- public void setglasswidth(Double glasswidth) {
- this.glasswidth = glasswidth;
+ public void setGlassHeightMm(Double glassheightmm) {
+ this.glassheightmm = glassheightmm;
}
- public Double getglassheight() {
- return glassheight;
+ public Integer getDisabled() {
+ return disabled;
}
- public void setglassheight(Double glassheight) {
- this.glassheight = glassheight;
+ public void setDisabled(Integer disabled) {
+ this.disabled = disabled;
}
->>>>>>> 7870c2d4fd6da5269a87f53d584a36628fd8ef12
+ 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;
+ }
+
}
--
Gitblit v1.8.0