From d5bb894f9be2e0a3b62d475b60b44f2ab138528c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 12 六月 2025 16:48:35 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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 7f9835b..89c8bf3 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,11 +3,14 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.time.LocalDate;
+import java.util.List;
@Data
+@TableName("sd.order_glass_detail")
public class OrderGlassDetail {
@TableId(type = IdType.AUTO)
@@ -19,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;
@@ -27,11 +34,12 @@
private Integer group;
private LocalDate productionTime;
private LocalDate createTime;
-// @TableField(select = false)
+
+ @TableField(select = false,exist = false)
+ private Integer thickness;
+
+ @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