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 | 77 ++++++++++++++++++++++++++++----------
1 files changed, 57 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
index 3b52fe5..93812e2 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.basic.dto.StorageBlobDTO;
+import com.ruoyi.basic.dto.StorageBlobVO;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
@@ -25,8 +27,15 @@
private String entryDateStart;
private String entryDateEnd;
+ @Schema(description = "鍏ュ簱鐘舵��")
+ private String stockInStatus;
private Long id;
+
+ /**
+ * 瀹℃壒瀹炰緥ID
+ */
+ private Long approvalInstanceId;
/**
* 閲囪喘鍚堝悓鍙�
@@ -46,11 +55,11 @@
*/
@Excel(name = "渚涘簲鍟嗗悕绉�")
private String supplierName;
- /**
- * 鏄惁鐧藉悕鍗�
- */
- @Excel(name = "鏄惁鐧藉悕鍗�")
- private Integer isWhite;
+// /**
+// * 鏄惁鐧藉悕鍗�
+// */
+// @Excel(name = "鏄惁鐧藉悕鍗�")
+// private Integer isWhite;
/**
* 褰曞叆浜哄鍚峣d
@@ -84,9 +93,16 @@
/**
* 褰曞叆鏃ユ湡
*/
- @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")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date applicationSubmitTime;
/**
* 绛捐鏃ユ湡
@@ -129,6 +145,9 @@
private List<SalesLedgerProduct> productData;
+ @Schema(description = "鎵归噺澶勭悊閲囪喘鍙拌处ID鍒楄〃")
+ private List<Long> ids;
+
private List<String> tempFileIds;
private List<CommonFile> SalesLedgerFiles;
@@ -163,26 +182,17 @@
private BigDecimal invoiceAmount;
/**
- * 鏉ョエ鐧昏id
- */
- private Long ticketRegistrationId;
-
- /**
* 鍚堝悓閲戦锛堜骇鍝佸惈绋庢�讳环锛�
*/
@Excel(name = "鍚堝悓閲戦")
private BigDecimal contractAmount = BigDecimal.ZERO;
+ /**
+ * 瀹為檯鍚堝悓閲戦锛堟墸鍑忛��璐у悗锛�
+ */
+ @Schema(description = "瀹為檯鍚堝悓閲戦")
+ private BigDecimal netContractAmount = BigDecimal.ZERO;
- @TableField(exist = false)
- @Schema(description = "鏉ョエ閲戦")
- @Excel(name = "宸叉潵绁ㄩ噾棰�(鍏�)")
- private BigDecimal receiptPaymentAmount = BigDecimal.ZERO;
-
- @Schema(description = "鏈潵绁ㄩ噾棰�")
- @TableField(exist = false)
- @Excel(name = "鏈潵绁ㄩ噾棰�(鍏�)")
- private BigDecimal unReceiptPaymentAmount =BigDecimal.ZERO;
@Schema(description = "鏂囦欢绫诲瀷 鍙� 4")
@TableField(exist = false)
@@ -191,10 +201,37 @@
@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 = "妯℃澘鍚嶇О")
private String templateName;
@Schema(description = "瀹℃壒浜篿d")
private Integer approverId;
+
+ private List<StorageBlobVO> storageBlobVOS;
+ private List<StorageBlobDTO> storageBlobDTOS;
}
--
Gitblit v1.9.3