From 2a6d8a858ca7e41436548b35db147b5cdad4e4be Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 14 十二月 2023 14:08:17 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/entity/Out_slice.java | 44 +++++++++++++++++++++++++++++++++++---------
1 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/Out_slice.java b/springboot-vue3/src/main/java/com/example/springboot/entity/Out_slice.java
index 84e3004..5ea7bb2 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/Out_slice.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/Out_slice.java
@@ -1,13 +1,24 @@
package com.example.springboot.entity;
-
+//鍑虹墖闃熷垪琛�
public class Out_slice {
- private int id;
- private String glassId;
- private String barcode;
- private double glasswidth;
- private double glassheight;
- private int state;
- private String time;
+ private int id;//鑷id
+ private String glassId;//鐜荤拑id
+ private String barcode;//閾濇id
+ private double glasswidth;//鐜荤拑瀹�
+ private double glassheight;//鐜荤拑楂�
+ private int state;//鍑虹墖鐘舵��
+ private int flip;//鏄惁缈昏浆
+ private String time;//淇敼鏃堕棿
+ private int sequence;//鍑虹墖椤哄簭
+ private String position;//鐜荤拑鎽嗘斁浣嶇疆
+
+ public String getPosition() {
+ return position;
+ }
+
+ public void setPosition(String position) {
+ this.position = position;
+ }
private north_glass_buffer1 north_glass_buffer1s;
@@ -40,6 +51,14 @@
this.glassheight = glassheight;
this.state = state;
this.time = time;
+ }
+
+ public int getFlip() {
+ return flip;
+ }
+
+ public void setFlip(int flip) {
+ this.flip = flip;
}
public int getID() {
@@ -78,7 +97,7 @@
this.glassId = glassId;
}
-public void setBarCode(String barCode) {
+ public void setBarCode(String barCode) {
barcode = barCode;
}
@@ -98,4 +117,11 @@
this.time = time;
}
+ public int getSequence() {
+ return sequence;
+ }
+
+ public void setSequence(int sequence) {
+ this.sequence = sequence;
+ }
}
--
Gitblit v1.8.0