From fec9f42e00f2df68a2a20cbf132b17bdeed8e63a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 25 八月 2025 09:19:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java | 18 ++++++++++++++++++
1 files changed, 18 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
index 6596829..3395529 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
@@ -4,6 +4,7 @@
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;
@@ -13,6 +14,7 @@
import java.util.List;
@Data
+@TableName("sd.`order_detail`")
public class OrderDetail {
@TableId(type = IdType.AUTO)
private Long id;
@@ -44,10 +46,17 @@
private Integer deliveryNum;
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)
@@ -67,4 +76,13 @@
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