From aed64ecf84f628253c8cc6008e3804f6f2237a5b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 09 四月 2024 08:20:56 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedGoodsInventory.java | 10 +++++++---
1 files changed, 7 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..1e3763b 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,9 @@
private String remark;
private LocalDate updateTime;
private LocalDate endTime;
+ private String processId;
+
+ private Order order;
+ private OrderDetail orderDetail;
}
--
Gitblit v1.8.0