From 1750abd11320f8d09ffe1580b7467dba87c86c89 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 10 十二月 2025 14:40:25 +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/OrderDetail.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java
index 38fbe40..f9999cb 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java
@@ -36,6 +36,7 @@
private String processingNote;
private String remarks;
private Double bendRadius;
+ private String processAttribute;
private String edgingType;
private Double archRise;
private Double weight;
@@ -44,12 +45,20 @@
private String otherColumns;
private Integer warehouseNum;
private Integer deliveryNum;
+ private Integer outStockNum;
private Integer returnNum;
private Integer state;
+ private String fileName;
+ @TableField(select = false,exist= false)
+ private String fileData;
+ @TableField(select = false,exist= false)
+ private String fileJson;
private LocalDate createTime;
private LocalDate updateTime;
@TableField(select = false,exist= false)
private Order order;
+ @TableField(select = false,exist= false)
+ private OrderGlassDetail orderGlassDetail;
@TableField(select = false,exist= false)
private Delivery delivery;
@TableField(select = false,exist= false)
@@ -78,4 +87,12 @@
@TableField(exist= false,select = false)
private Double thickness;
+ //鐢ㄤ簬鏅鸿兘鍒嗘灦
+ @TableField(exist= false,select = false)
+ private Double longSide;
+
+ //鐢ㄤ簬鏅鸿兘鍒嗘灦
+ @TableField(exist= false,select = false)
+ private Double shortSide;
+
}
--
Gitblit v1.8.0