From ad4e0e5444d2f4f6a4df45742a146428d646d02e Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 01 七月 2024 13:23:56 +0800
Subject: [PATCH] 提交空闲位置
---
north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java
index 23d512b..c483c63 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java
@@ -1,20 +1,24 @@
package com.example.erp.entity.sd;
+import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.example.erp.entity.mm.FinishedGoodsInventory;
import lombok.Data;
import java.time.LocalDate;
@Data
-@TableName("`order`")
+@TableName("sd.`order`")
public class Order {
@TableId(type = IdType.AUTO)
-
+ @ExcelProperty("id")
private Long id;
+ @ExcelProperty("璁㈠崟缂栧彿")
private String orderId;
+ @ExcelProperty("椤圭洰鍚嶇О")
private String project;
private Integer customerId;
private String customerName;
@@ -22,7 +26,7 @@
private String orderClassify;
private String icon;
private String packType;
- private String deliveryDate;
+ private LocalDate deliveryDate;
private String batch;
private Integer calculateType;
private Integer salesmanId;
@@ -40,7 +44,7 @@
private String otherRemarks;
private Double area;
private Long quantity;
- private String perimeter;
+ private Double perimeter;
private String verifierId;
private String verifier;
private String creatorId;
@@ -54,8 +58,12 @@
private Integer delivery;
private LocalDate createTime;
private LocalDate updateTime;
+ @TableField(select = false,exist = false)
+ private Integer goodsQuantity;
@TableField(value = "customer_id")
private Customer customer;
+ @TableField(select = false)
+ private FinishedGoodsInventory finishedGoodsInventory;
}
--
Gitblit v1.8.0