From b8982b86a15d186c4cf6144fface700d9769fa95 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 21 三月 2025 09:13:13 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 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 3f032e8..74a2b5b 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
@@ -1,5 +1,6 @@
package com.example.erp.entity.sd;
+import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -9,6 +10,7 @@
import lombok.NoArgsConstructor;
import java.time.LocalDate;
+import java.util.List;
@Data
public class OrderDetail {
@@ -31,24 +33,47 @@
private Double computeGrossArea;
private String processingNote;
private String remarks;
- private Integer bendRadius;
+ private Double bendRadius;
private String edgingType;
+ private Double archRise;
private Double weight;
private Double perimeter;
+ private Double monolithicPerimeter;
+ private String otherColumns;
private Integer warehouseNum;
private Integer deliveryNum;
private Integer returnNum;
private Integer state;
private LocalDate createTime;
private LocalDate updateTime;
- @TableField(select = false)
+ @TableField(select = false,exist= false)
private Order order;
- @TableField(select = false)
+ @TableField(select = false,exist= false)
private Delivery delivery;
- @TableField(select = false)
+ @TableField(select = false,exist= false)
private DeliveryDetail deliveryDetail;
- @TableField(select = false)
+ @TableField(select = false,exist= false)
private FinishedGoodsInventory finishedGoodsInventory;
+ @TableField(select = false,exist= false)
+ private List<OrderGlassDetail> orderGlassDetails;
+
+ @TableField(exist= false)
+ private String levelOne;
+ @TableField(exist= false)
+ private String levelTwo;
+ @TableField(exist= false)
+ private String totalThickness;
+ @TableField(exist= false)
+ private Integer differentSize;//鐢ㄤ簬鏍囩鎵撳嵃鏃� 鏄庣粏鏄惁鏄剧ず
//private Product product;
+ @TableField(exist= false,select = false)
+ private String processId;
+ @TableField(exist= false,select = false)
+ private String baiscQuantity;
+ @TableField(exist= false,select = false)
+ private Integer landingSequence;
+ @TableField(exist= false,select = false)
+ private Double thickness;
+
}
--
Gitblit v1.8.0