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/pojo/PurchaseLedger.java | 92 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 79 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
index 717dc66..cdcfcd9 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
@@ -69,9 +69,15 @@
/**
* 褰曞叆鏃ユ湡
*/
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "褰曞叆鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date entryDate;
+
+ /**
+ * 鐢宠鎻愪氦鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date applicationSubmitTime;
/**
@@ -119,6 +125,12 @@
* 鍚堝悓閲戦锛堜骇鍝佸惈绋庢�讳环锛�
*/
private BigDecimal contractAmount;
+
+ /**
+ * 瀹為檯鍚堝悓閲戦锛堟墸鍑忛��璐у悗锛�
+ */
+ @Schema(description = "瀹為檯鍚堝悓閲戦")
+ private BigDecimal netContractAmount;
//
// /**
// * 涓氬姟鍛�
@@ -136,20 +148,78 @@
*/
private String phoneNumber;
- @TableField(exist = false)
- @Schema(description = "鏉ョエ閲戦")
- private String receiptPaymentAmount;
-
- @Schema(description = "鏈潵绁ㄩ噾棰�")
- @TableField(exist = false)
- private String unReceiptPaymentAmount;
-
@Schema(description = "鏂囦欢绫诲瀷 鍙� 4")
@TableField(exist = false)
private Integer type;
@Schema(description = "浠樻鏂瑰紡")
private String paymentMethod;
+
+ /**
+ * 閲囪喘绫诲埆锛氬瀛樸�佷唬鍌ㄣ�侀噰璐叆搴撱�侀噰璐洿閿�
+ */
+ @Schema(description = "閲囪喘绫诲埆")
+ @Excel(name = "閲囪喘绫诲埆")
+ private String purchaseCategory;
+
+ /**
+ * 閲囪喘娌瑰搧锛氭苯#92銆佹苯#95銆佹煷#0銆佹煷#-35
+ */
+ @Schema(description = "閲囪喘娌瑰搧")
+ @Excel(name = "閲囪喘娌瑰搧")
+ private String purchaseOilProduct;
+
+ /**
+ * 鐗╂祦鏂瑰紡锛氬巶瀹堕厤閫併�佸澶栫墿娴併�佸鎴疯嚜鎻�
+ */
+ @Schema(description = "鐗╂祦鏂瑰紡")
+ @Excel(name = "鐗╂祦鏂瑰紡")
+ private String logisticsMethod;
+
+ /**
+ * 鎻愯揣鏂瑰紡锛氭殏涓嶆彁璐с�佹彁璐�
+ */
+ @Schema(description = "鎻愯揣鏂瑰紡")
+ @Excel(name = "鎻愯揣鏂瑰紡")
+ private String pickupMethod;
+
+ /**
+ * 閲囪喘娌瑰簱id
+ */
+ @Schema(description = "閲囪喘娌瑰簱id")
+ private Long oilDepotId;
+
+ /**
+ * 閲囪喘娌瑰簱鍚嶇О
+ */
+ @Schema(description = "閲囪喘娌瑰簱鍚嶇О")
+ @Excel(name = "閲囪喘娌瑰簱")
+ private String oilDepotName;
+
+ /**
+ * 瀹㈡埛鍚嶇О
+ */
+ @Schema(description = "瀹㈡埛鍚嶇О")
+ private String customerName;
+
+ /**
+ * 鏈�浣冲埌绔欐棩鏈�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Schema(description = "鏈�浣冲埌绔欐棩鏈�")
+ private Date bestArrivalDate;
+
+ /**
+ * 閲囪喘鏁伴噺锛堝惃锛�
+ */
+ @Schema(description = "閲囪喘鏁伴噺锛堝惃锛�")
+ private Integer purchaseQuantity;
+
+ /**
+ * 閲囪喘鐢宠璁㈠崟鐘舵�侊細宸茬敵璇凤紝鏈杞� / 浠ュ嚭鍘傦紝鏈叆搴� / 宸插叆搴�
+ */
+ @Schema(description = "閲囪喘鐢宠璁㈠崟鐘舵��")
+ private String purchaseOrderStatus;
@Schema(description = "瀹℃壒鐘舵�� 1-寰呭鏍革紝2-瀹℃壒涓紝3-瀹℃壒閫氳繃锛�4-瀹℃壒澶辫触,5琛ㄧず鏄ā鏉�")
@Excel(name = "瀹℃壒鐘舵��", readConverterExp = "1=寰呭鏍�,2=瀹℃壒涓�,3=瀹℃壒閫氳繃,4=瀹℃壒澶辫触")
private Integer approvalStatus;
@@ -165,8 +235,4 @@
@TableField(fill = FieldFill.INSERT)
private Long deptId;
-
- @Schema(description = "妯℃澘id")
- private Long templateId;
-
}
--
Gitblit v1.9.3