From 606e7a619b7d3f6388c19c462b74f60ea2334ea4 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 25 二月 2025 08:55:25 +0800
Subject: [PATCH] 修改配置文件
---
north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 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 6e65b5b..8e5ea96 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,17 +1,22 @@
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;
+import com.example.erp.entity.mm.FinishedGoodsInventory;
+import lombok.AllArgsConstructor;
import lombok.Data;
+import lombok.NoArgsConstructor;
import java.time.LocalDate;
+import java.util.List;
@Data
public class OrderDetail {
@TableId(type = IdType.AUTO)
-
private Long id;
-
+ private String orderId;
private Integer orderNumber;
private String buildingNumber;
private Integer productId;
@@ -28,18 +33,41 @@
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,exist= false)
private Order order;
+ @TableField(select = false,exist= false)
+ private Delivery delivery;
+ @TableField(select = false,exist= false)
+ private DeliveryDetail deliveryDetail;
+ @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 flowCardId;
+
}
--
Gitblit v1.8.0