From fec9f42e00f2df68a2a20cbf132b17bdeed8e63a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 25 八月 2025 09:19:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedGoodsInventory.java | 42 ++++++++++++++++++++----------------------
1 files changed, 20 insertions(+), 22 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..8981f66 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
@@ -1,9 +1,9 @@
package com.example.erp.entity.mm;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
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 +13,26 @@
@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 String orderId;
+ private Integer orderNumber;
+ private Integer inventory;
+ private Double actualSignalArea;
private Double area;
- private Integer quantity;
- private Double money;
- private String remarks;
- private LocalDate createTime;
+ private Integer quantityAvailable;
+ private String warehouseNumber;
+ private String storageRegion;
+ private Integer status;
+ private LocalDate enterStorageTime;
+ private String remark;
private LocalDate updateTime;
+ private LocalDate endTime;
+ private String processId;
+ private String boxNo;
+ @TableField(select = false,exist = false)
private Order order;
- private Customer customer;
+ @TableField(select = false,exist = false)
+ private OrderDetail orderDetail;
+ @TableField(select = false,exist = false)
+ private Double weight;
}
--
Gitblit v1.8.0