From 173f44a1f9a59509996192e3446cbd26f2613b5e Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 10 十月 2025 15:55:32 +0800
Subject: [PATCH] yys 新增关键煤种锁仓模块
---
main-business/src/main/java/com/ruoyi/business/entity/PendingInventory.java | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 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 07cea32..7144e12 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,6 +4,7 @@
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;
@@ -25,26 +26,51 @@
*/
@TableId(value = "id", type = IdType.AUTO)
private Long id;
+
+ /**
+ *
+ * 鐢熶骇鍔犲伐id
+ */
+ @TableField(value = "master_id")
+ private Long masterId;
+ /**
+ *
+ * 閲囪喘id
+ */
+ @TableField(value = "purchase_id")
+ private Long purchaseId;
/**
* 渚涜揣鍟嗗悕绉�
*/
@TableField(value = "supplier_name")
private String supplierName;
+
+ /**
+ * 渚涜揣鍟嗗悕绉�
+ */
+ @TableField(value = "supplier_id")
+ private Long supplierId;
/**
* 鐓ょ
*/
@TableField(value = "coal_id")
private Long coalId;
/**
- * 鐓ょ
+ * 鐓ゆ枡绫诲瀷 1-鎴愬搧 2-鍘熸枡
*/
- @TableField(value = "coal")
- private String coal;
+ @TableField(value = "type")
+ private Integer type;
/**
* 鍗曚綅
*/
@TableField(value = "unit")
private String unit;
+
+ /**
+ * 缂栫爜
+ */
+ @TableField(value = "code")
+ private String code;
/**
* 搴撳瓨鏁伴噺
*/
@@ -74,10 +100,21 @@
* 鐧昏浜�
*/
@TableField(value = "registrant_id")
- private String registrantId;
+ private Long registrantId;
+ /**
+ * 鐓よ川鏂规id
+ */
+ @TableField(value = "coal_plan_id")
+ private Long coalPlanId;
+ /**
+ * 閲囪喘绫诲瀷
+ */
+ @TableField(value = "purchase_type")
+ private Integer purchaseType;
/**
* 鐧昏鏃ユ湡
*/
@TableField(value = "registration_date")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate registrationDate;
}
\ No newline at end of file
--
Gitblit v1.9.3