From d5bb894f9be2e0a3b62d475b60b44f2ab138528c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 12 六月 2025 16:48:35 +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 | 81 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 81 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
new file mode 100644
index 0000000..38fbe40
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java
@@ -0,0 +1,81 @@
+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;
+
+@Data
+@TableName("sd.`order_detail`")
+public class OrderDetail {
+ @TableId(type = IdType.AUTO)
+ private Long id;
+ private String orderId;
+ private Integer orderNumber;
+ private String buildingNumber;
+ private Integer productId;
+ private String productName;
+ private Double price;
+ private Long quantity;
+ private Double grossAmount;
+ private Double width;
+ private Double height;
+ private String shape;
+ private Double area;
+ private Double grossArea;
+ private Double computeArea;
+ private Double computeGrossArea;
+ private String processingNote;
+ private String remarks;
+ 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 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