From 42bc535c947bcf999c706a753635d35ef73f91e6 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 22 四月 2024 09:11:16 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java
index ef94a1c..c4ff1c0 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java
@@ -3,15 +3,14 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.AllArgsConstructor;
+import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
-import lombok.NoArgsConstructor;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
import java.time.LocalDate;
+import java.util.List;
@Data
+@TableName("sd.order_glass_detail")
public class OrderGlassDetail {
@TableId(type = IdType.AUTO)
@@ -23,6 +22,9 @@
private String glassChild;
private Double childWidth;
private Double childHeight;
+ private Double area;
+ private Double totalArea;
+ private String icon;
private String process;
private String productionId;
private Integer splittingStatus;
@@ -31,11 +33,12 @@
private Integer group;
private LocalDate productionTime;
private LocalDate createTime;
-// @TableField(select = false)
-// private Order order;
+ @TableField(select = false,exist = false)
+ private Order order;
//@TableField(select = false)
// @ManyToOne(fetch = FetchType.LAZY)
- private OrderDetail orderDetail;
+ @TableField(select = false,exist = false)
+ private OrderDetail orderDetail;
}
--
Gitblit v1.8.0