From 4f3aa71ed602c1abbafa638591b20abc3c7be224 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 18 一月 2024 10:03:45 +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 | 124 ++++++++++++++++++++++++++++++++++-------
1 files changed, 102 insertions(+), 22 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..05d8c24 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,15 +1,49 @@
package com.example.springboot.entity;
+import java.util.Comparator;
+
+//瀹㈡埛鐜荤拑淇℃伅琛�
public class north_glass_buffer1 {
- private Integer id; //鑷id
- private String ordernumber;//璁㈠崟id
- private String listnumber;//闆嗗悎id
- private String boxnumber;//绠卞瓙id
- private String barcode;//鐜荤拑id
- private double glasslength;//鐜荤拑瀹�
- private double glassheight;//鐜荤拑楂�
- private double glasslength_mm;//鐜荤拑瀹絤m
- private double glassheight_mm;//鐜荤拑楂榤m
+ private Integer id; // 鑷id
+ private String ordernumber;// 璁㈠崟id
+ private String listnumber;// 闆嗗悎id
+ private String boxnumber;// 绠卞瓙id
+ private String barcode;// 鐜荤拑id
+ private double glasslength;// 鐜荤拑瀹�
+ private double glassheight;// 鐜荤拑楂�
+ 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
+
+ public 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;
@@ -22,15 +56,19 @@
public Integer getId() {
return id;
}
+
public String getordernumber() {
return ordernumber;
}
+
public void setordernumber(String ordernumber) {
this.ordernumber = ordernumber;
}
+
public String getlistnumber() {
return listnumber;
}
+
public void setlistnumber(String listnumber) {
this.listnumber = listnumber;
}
@@ -38,22 +76,23 @@
public String getboxnumber() {
return boxnumber;
}
+
public void setboxnumber(String boxnumber) {
this.boxnumber = boxnumber;
}
-
public String getbarcode() {
return barcode;
}
+
public void setbarcode(String barcode) {
this.barcode = barcode;
}
-
public Double getglasslength() {
return glasslength;
}
+
public void setglasslength(Double glasslength) {
this.glasslength = glasslength;
}
@@ -61,24 +100,65 @@
public Double getglassheight() {
return glassheight;
}
+
public void setglassheight(Double glassheight) {
this.glassheight = glassheight;
}
- public Double getglasslength_mm() {
- return glasslength_mm;
- }
- public void setglasslength_mm(Double glasslength_mm) {
- this.glasslength_mm = glasslength_mm;
+ public Double getglasslengthmm() {
+ return glasslengthmm;
}
- public Double glassheight_mm() {
- return glassheight_mm;
- }
- public void setglassheight_mm(Double glassheight_mm) {
- this.glassheight_mm = glassheight_mm;
+ public void setglasslengthmm(Double glasslengthmm) {
+ this.glasslengthmm = glasslengthmm;
}
-
+ public Double getglassheightmm() {
+ return glassheightmm;
+ }
+
+ 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