From cb966ac5c02835eab5a99b7b93a5a9a063cf3201 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 25 六月 2025 15:55:08 +0800
Subject: [PATCH] 人员优化
---
main-business/src/main/java/com/ruoyi/business/entity/PendingInventory.java | 43 ++++++++++++++++++++++++++++++-------------
1 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/main-business/src/main/java/com/ruoyi/business/entity/PendingInventory.java b/main-business/src/main/java/com/ruoyi/business/entity/PendingInventory.java
index c30d533..1b4c928 100644
--- a/main-business/src/main/java/com/ruoyi/business/entity/PendingInventory.java
+++ b/main-business/src/main/java/com/ruoyi/business/entity/PendingInventory.java
@@ -4,11 +4,12 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.MyBaseEntity;
import lombok.Data;
import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDate;
/**
* 寰呭叆搴撹〃 瀹炰綋绫�
@@ -20,23 +21,33 @@
@TableName("pending_inventory")
public class PendingInventory extends MyBaseEntity {
- private static final long serialVersionUID = 1L;
-
/**
* 涓婚敭ID
*/
@TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ private Long id;
+
+ /**
+ *
+ * 鐢熶骇鍔犲伐id
+ */
+ @TableField(value = "master_id")
+ private Long masterId;
/**
* 渚涜揣鍟嗗悕绉�
*/
@TableField(value = "supplier_name")
private String supplierName;
/**
+ * 渚涜揣鍟嗗悕绉�
+ */
+ @TableField(value = "supplier_id")
+ private Long supplierId;
+ /**
* 鐓ょ
*/
- @TableField(value = "coal")
- private String coal;
+ @TableField(value = "coal_id")
+ private Long coalId;
/**
* 鍗曚綅
*/
@@ -58,18 +69,24 @@
@TableField(value = "total_price_including_tax")
private BigDecimal totalPriceIncludingTax;
/**
- * 鎴愭湰鍗曚环
+ * 涓嶅惈绋庡崟浠�
*/
- @TableField(value = "cost_per_unit")
- private BigDecimal costPerUnit;
+ @TableField(value = "price_excluding_tax")
+ private BigDecimal priceExcludingTax;
+ /**
+ * 涓嶅惈绋庢�讳环
+ */
+ @TableField(value = "total_price_excluding_tax")
+ private BigDecimal totalPriceExcludingTax;
/**
* 鐧昏浜�
*/
@TableField(value = "registrant_id")
- private String registrantId;
+ private Long registrantId;
/**
- * 鐧昏鏃堕棿
+ * 鐧昏鏃ユ湡
*/
- @TableField(value = "registration_time")
- private Date registrationTime;
+ @TableField(value = "registration_date")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate registrationDate;
}
\ No newline at end of file
--
Gitblit v1.9.3