From 2f44fc75c78e9291f07a0864199235cde689fa8d Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 12 十二月 2025 12:29:37 +0800
Subject: [PATCH] 订单明细报表新增楼层编号跟其他列
---
north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java | 42 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 41 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 6da7abe..967d760 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,16 +1,21 @@
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.baomidou.mybatisplus.annotation.TableName;
import com.example.erp.entity.mm.FinishedGoodsInventory;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalDate;
+import java.util.List;
+import java.util.Map;
@Data
+@TableName("sd.`order_detail`")
public class OrderDetail {
@TableId(type = IdType.AUTO)
private Long id;
@@ -31,31 +36,66 @@
private Double computeGrossArea;
private String processingNote;
private String remarks;
- private Integer bendRadius;
+ private Double bendRadius;
+ private String processAttribute;
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 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)
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 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;
+ @TableField(exist= false,select = false)
+ private Map<String, Object> otherColumnsJson;
+
+ //鐢ㄤ簬鏅鸿兘鍒嗘灦
+ @TableField(exist= false,select = false)
+ private Double longSide;
+
+ //鐢ㄤ簬鏅鸿兘鍒嗘灦
+ @TableField(exist= false,select = false)
+ private Double shortSide;
+
}
--
Gitblit v1.8.0