From 2263d722551f8179376c7291124148effa391672 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 26 一月 2024 16:14:28 +0800
Subject: [PATCH] 修改order实体类文件

---
 north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedGoodsInventory.java |   37 +++++++++++++------------------------
 1 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedGoodsInventory.java b/north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedGoodsInventory.java
index 6763729..40f2159 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedGoodsInventory.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedGoodsInventory.java
@@ -2,8 +2,7 @@
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.example.erp.entity.sd.Customer;
-import com.example.erp.entity.sd.Order;
+import com.example.erp.entity.sd.*;
 import lombok.Data;
 
 import java.time.LocalDate;
@@ -13,28 +12,18 @@
     @TableId(type = IdType.AUTO)
 
     private Long id;
-    private Integer deliveryState;
-    private Integer stockState;
-    private String deliveryId;
-    private String project;
-    private String customerName;
-    private LocalDate deliveryDate;
-    private String payMethod;
-    private LocalDate payDate;
-    private String salaManId;
-    private String salaMan;
-    private String createrId;
-    private String creator;
-    private String contacts;
-    private String contactNumber;
-    private String deliveryAddress;
-    private Double area;
-    private Integer quantity;
-    private Double money;
-    private String remarks;
-    private LocalDate createTime;
-    private LocalDate updateTime;
     private Order order;
-    private Customer customer;
+    private OrderDetail orderDetail;
+    private Integer inventory    ;
+    private Double actualSignalArea;
+    private Double area;
+    private Integer quantityAvailable;
+    private String warehouseNumber;
+    private String storageRegion;
+    private Integer status;
+    private LocalDate enterStorageTime;
+    private String remark;
+    private LocalDate updateTime;
+    private LocalDate endTime;
 
 }

--
Gitblit v1.8.0