From d8c86797adaef6c416efae16586f350ae77bde4b Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期六, 12 九月 2026 12:43:08 +0800
Subject: [PATCH] feat: 库存入库/出库字段全链路、采购台账申请提交时间、储罐租客信息、油库储罐模块
---
src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
index ee089a5..93812e2 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
@@ -98,6 +98,13 @@
private Date entryDate;
/**
+ * 鐢宠鎻愪氦鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date applicationSubmitTime;
+
+ /**
* 绛捐鏃ユ湡
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@@ -194,6 +201,30 @@
@Schema(description = "浠樻鏂瑰紡")
private String paymentMethod;
+ @Schema(description = "閲囪喘绫诲埆锛氬瀛樸�佷唬鍌ㄣ�侀噰璐叆搴撱�侀噰璐洿閿�")
+ private String purchaseCategory;
+
+ @Schema(description = "閲囪喘娌瑰搧锛氭苯#92銆佹苯#95銆佹煷#0銆佹煷#-35")
+ private String purchaseOilProduct;
+
+ @Schema(description = "鐗╂祦鏂瑰紡锛氬巶瀹堕厤閫併�佸澶栫墿娴併�佸鎴疯嚜鎻�")
+ private String logisticsMethod;
+
+ @Schema(description = "鎻愯揣鏂瑰紡锛氭殏涓嶆彁璐с�佹彁璐�")
+ private String pickupMethod;
+ @Schema(description = "閲囪喘娌瑰簱id")
+ private Long oilDepotId;
+ @Schema(description = "閲囪喘娌瑰簱鍚嶇О")
+ private String oilDepotName;
+ @Schema(description = "瀹㈡埛鍚嶇О")
+ private String customerName;
+ @Schema(description = "鏈�浣冲埌绔欐棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date bestArrivalDate;
+ @Schema(description = "閲囪喘鏁伴噺锛堝惃锛�")
+ private Integer purchaseQuantity;
+ @Schema(description = "閲囪喘鐢宠璁㈠崟鐘舵��")
+ private String purchaseOrderStatus;
@Schema(description = "瀹℃壒鐘舵��")
private Integer approvalStatus;
@Schema(description = "妯℃澘鍚嶇О")
--
Gitblit v1.9.3