From afbddf62e45bce6fd9428cddec36382c75cee53a Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 07 十二月 2023 08:38:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java | 81 +++++++++++++++++++++++++++++++++++-----
1 files changed, 70 insertions(+), 11 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java b/springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java
index 97842af..2e2843d 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/north_glass_buffer1.java
@@ -1,5 +1,5 @@
package com.example.springboot.entity;
-
+//瀹㈡埛鐜荤拑淇℃伅琛�
public class north_glass_buffer1 {
private Integer id; //鑷id
private String ordernumber;//璁㈠崟id
@@ -8,8 +8,37 @@
private String barcode;//鐜荤拑id
private double glasslength;//鐜荤拑瀹�
private double glassheight;//鐜荤拑楂�
- private double glasslength_mm;//鐜荤拑瀹絤m
- private double glassheight_mm;//鐜荤拑楂榤m
+ private double glasslengthmm;//鐜荤拑瀹絤m
+ private double glassheightmm;//鐜荤拑楂榤m
+
+ private String glassoutside;//
+ private String glassinside;//
+ private String glassbetween;//
+ private String itemtype;//
+ private String slotnumber;//鏍煎瓙
+ private String datemodified;//
+ private String datecreated;//
+ private String FrameBarcode;//閾濇id
+
+ private StorageCage storageCage;
+
+ public void setstorageCage(StorageCage storageCage) {
+ this.storageCage = storageCage;
+ }
+
+ public StorageCage getstorageCage() {
+ return storageCage;
+ }
+
+ private Out_slice out_slice;
+
+ public void setOut_slice(Out_slice out_slice) {
+ this.out_slice = out_slice;
+ }
+
+ public Out_slice getOut_slice() {
+ return out_slice;
+ }
public Integer id() {
return id;
@@ -65,20 +94,50 @@
this.glassheight = glassheight;
}
- public Double getglasslength_mm() {
- return glasslength_mm;
+ public Double getglasslengthmm() {
+ return glasslengthmm;
}
- public void setglasslength_mm(Double glasslength_mm) {
- this.glasslength_mm = glasslength_mm;
+ public void setglasslengthmm(Double glasslengthmm) {
+ this.glasslengthmm = glasslengthmm;
}
- public Double glassheight_mm() {
- return glassheight_mm;
+ public Double getglassheightmm() {
+ return glassheightmm;
}
- public void setglassheight_mm(Double glassheight_mm) {
- this.glassheight_mm = glassheight_mm;
+ public void setglassheightmm(Double glassheightmm) {
+ this.glassheightmm = glassheightmm;
}
+ public String getitemtype() {
+ return itemtype;
+ }
+ public void setitemtype(String itemtype) {
+ this.itemtype = itemtype;
+ }
+ public String getslotnumber() {
+ return slotnumber;
+ }
+ public void setslotnumber(String slotnumber) {
+ this.slotnumber = slotnumber;
+ }
+ public String getdatemodified() {
+ return datemodified;
+ }
+ public void setdatemodified(String datemodified) {
+ this.datemodified = datemodified;
+ }
+ public String getdatecreated() {
+ return datecreated;
+ }
+ public void setdatecreated(String datecreated) {
+ this.datecreated = datecreated;
+ }
+ public String getFrameBarcode() {
+ return FrameBarcode;
+ }
+ public void setFrameBarcode(String FrameBarcode) {
+ this.FrameBarcode = FrameBarcode;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0