From b9e4e2edbb3767ee347a91d2238544ae736b53c0 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 22 七月 2025 10:29:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedGoodsInventory.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 a6eab00..bd66074 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;
@@ -15,16 +14,21 @@
private Long id;
private String orderId;
private Integer orderNumber;
- private Integer inventory ;
+ private Integer inventory;
private Double actualSignalArea;
private Double area;
private Integer quantityAvailable;
private String warehouseNumber;
- private LocalDate storageRegion;
+ private String storageRegion;
private Integer status;
private LocalDate enterStorageTime;
private String remark;
private LocalDate updateTime;
private LocalDate endTime;
+ private String processId;
+ private String boxNo;
+ private Order order;
+ private OrderDetail orderDetail;
+ private Double weight;
}
--
Gitblit v1.8.0