From a15dba424e67b4773a546246c396b83d3b820d98 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 04 七月 2024 10:27:12 +0800
Subject: [PATCH] 提交重复订单提示
---
north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java | 18 +++++++++++-------
1 files changed, 11 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..0f49d25 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,10 @@
private String glassChild;
private Double childWidth;
private Double childHeight;
+ private Double area;
+ private Double totalArea;
+ private Double arc;//寮ч暱
+ private String icon;
private String process;
private String productionId;
private Integer splittingStatus;
@@ -31,11 +34,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