From 00a6c486eb0f4aec35af265ff9851bff41f18bd2 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 18 三月 2024 16:43:26 +0800
Subject: [PATCH] 修改报工前端判断流程卡位数

---
 north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java
index d2a4f66..6c36b81 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java
@@ -1,12 +1,15 @@
 package com.example.erp.entity.sd;
 
 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 lombok.Data;
 
 import java.time.LocalDate;
 
 @Data
+@TableName("sd.order_glass_detail")
 public class OrderGlassDetail {
     @TableId(type = IdType.AUTO)
 
@@ -18,15 +21,22 @@
     private String glassChild;
     private Double childWidth;
     private Double childHeight;
+    private Double area;
+    private Double totalArea;
+    private String icon;
     private String process;
     private String productionId;
     private Integer splittingStatus;
     private String founder;
+    @TableField(value = "`group`")
     private Integer group;
-    private LocalDate produtionTime;
+    private LocalDate productionTime;
     private LocalDate createTime;
-
+   @TableField(select = false,exist = false)
     private  Order order;
+    //@TableField(select = false)
+//   @ManyToOne(fetch = FetchType.LAZY)
+    @TableField(select = false,exist = false)
     private  OrderDetail orderDetail;
 
 

--
Gitblit v1.8.0