From 3abf7a08a772acf35499b51f0c0e783804fc14f4 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 27 三月 2025 10:37:34 +0800
Subject: [PATCH] 报工新增查询添加显示上下工序接收审核状态

---
 north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java |   21 ++++++++++++++++++++-
 1 files changed, 20 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 be95348..38fbe40 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,14 +4,17 @@
 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;
@@ -32,10 +35,12 @@
     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;
@@ -51,12 +56,26 @@
     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