From 3f98ccf49e7ffc098689c37237bd1dceed651ca1 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 27 十一月 2023 09:14:39 +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 |   99 ++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 81 insertions(+), 18 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 4a05577..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,7 +1,10 @@
 package com.example.springboot.entity;
 
+
+
 public class StorageCage {
     private Integer id;
+    private Integer prcId;
     private String glassId;
     private Integer cage;
     private Integer cell;
@@ -9,18 +12,52 @@
     private Double glasswidth;
     private Double glassheight;
     private String state;
-    private Integer tier;  
+    private Integer tier;
     private String orderId;
+    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;
     }
+
     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;
@@ -29,14 +66,15 @@
     public void setGlassId(String glassId) {
         this.glassId = glassId;
     }
-     public String getOrderId() {
+
+    public String getOrderId() {
         return orderId;
     }
 
     public void setOrderId(String orderId) {
         this.orderId = orderId;
     }
-    
+
     public Integer getCage() {
         return cage;
     }
@@ -53,16 +91,6 @@
         return cell;
     }
 
-    
-
-    // public String getHeighth() {
-    //     return height;
-    // }
-
-    // public void setHeight(String height) {
-    //     this.height = height;
-    // }
-
     public Double getWidth() {
         return width;
     }
@@ -71,7 +99,7 @@
         this.width = width;
     }
 
-     public String getState() {
+    public String getState() {
         return state;
     }
 
@@ -79,26 +107,61 @@
         this.state = state;
     }
 
-      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 Integer getDisabled() {
+        return disabled;
+    }
+
+    public void setDisabled(Integer disabled) {
+        this.disabled = disabled;
+    }
+
+    public String getLengthWidth() {
+        return lengthWidth;
+    }
+
+    public void setLengthWidth(String lengthWidth) {
+        this.lengthWidth = lengthWidth;
+    }
+
+    public String getListno() {
+        return listno;
+    }
+
+    public void setListno(String listno) {
+        this.listno = listno;
+    }
+
+    public String getBoxno() {
+        return boxno;
+    }
+
+    public void setBoxno(String boxno) {
+        this.boxno = boxno;
+    }
+
+    
 }

--
Gitblit v1.8.0