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 | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 40f2159..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
@@ -12,9 +12,9 @@
@TableId(type = IdType.AUTO)
private Long id;
- private Order order;
- private OrderDetail orderDetail;
- private Integer inventory ;
+ private String orderId;
+ private Integer orderNumber;
+ private Integer inventory;
private Double actualSignalArea;
private Double area;
private Integer quantityAvailable;
@@ -25,5 +25,10 @@
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