From ef5a518c3e2c1fe41aa60f56ca31ddafa0cb1561 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 23 五月 2024 08:32:36 +0800
Subject: [PATCH] 添加产品汇总报表
---
north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 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 7b95b85..be95348 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,15 +1,19 @@
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;
@Data
public class OrderDetail {
@TableId(type = IdType.AUTO)
-
private Long id;
private String orderId;
private Integer orderNumber;
@@ -32,15 +36,27 @@
private String edgingType;
private Double weight;
private Double perimeter;
+ 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(exist= false)
+ private String levelOne;
+ @TableField(exist= false)
+ private String levelTwo;
+ @TableField(exist= false)
+ private String totalThickness;
//private Product product;
}
--
Gitblit v1.8.0