From 7bf754a7835d06f26240c4ca15bc5f83650de377 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 21 九月 2026 20:52:25 +0800
Subject: [PATCH] docs(api): 更新信托基金与代储台账及油品出库相关接口文档
---
src/main/java/com/ruoyi/sales/pojo/SalesLedger.java | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 102 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
index b6eaf67..6cc77f1 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -1,12 +1,15 @@
package com.ruoyi.sales.pojo;
-import java.math.BigDecimal;
-import java.util.Date;
-
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Date;
/**
* 閿�鍞彴璐﹀璞� sales_ledger
@@ -34,8 +37,9 @@
/**
* 瀹㈡埛鍚堝悓鍙�
*/
- @Excel(name = "瀹㈡埛鍚堝悓鍙�")
+ @Excel(name = "瀹㈡埛鍚堝悓鍙�", type = Excel.Type.IMPORT)
private String customerContractNo;
+
/**
* 椤圭洰鍚嶇О
@@ -46,8 +50,9 @@
/**
* 褰曞叆鏃ユ湡
*/
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "褰曞叆鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date entryDate;
/**
@@ -70,8 +75,12 @@
/**
* 褰曞叆浜�
*/
- @Excel(name = "褰曞叆浜�")
private String entryPerson;
+
+ @TableField(exist = false)
+ @Schema(description = "褰曞叆浜�")
+ @Excel(name = "褰曞叆浜�")
+ private String entryPersonName;
/**
* 澶囨敞
@@ -91,7 +100,93 @@
/**
* 鍚堝悓閲戦锛堜骇鍝佸惈绋庢�讳环锛�
*/
- @Excel(name = "绋庣巼")
+ @Excel(name = "鍚堝悓閲戦")
private BigDecimal contractAmount;
+
+ @Schema(description = "绛捐鏃ユ湡")
+ private LocalDate executionDate;
+
+ @Schema(description = "浠樻鏂瑰紡")
+ private String paymentMethod;
+
+ @Schema(description = "瀹為檯鍚堝悓閲戦")
+ private BigDecimal netContractAmount;
+
+ @TableField(exist = false)
+ @Schema(description = "鐢熶骇鐘舵��")
+ private String productionStatus = "鏈紑濮�";
+
+ //浜よ揣鏃ユ湡
+ @Schema(description = "浜よ揣鏃ユ湡")
+ @TableField(value = "delivery_date")
+ private LocalDate deliveryDate;
+
+ @TableField(exist = false)
+ @Schema(description = "浜よ揣澶╂暟宸�")
+ private Integer deliveryDaysDiff;
+
+ @TableField(exist = false)
+ //鏄惁鍙戣揣(鍙拌处椤甸潰棰滆壊鎺у埗)
+ private Boolean isFh;
+
+ @TableField(exist = false)
+ //鏄惁鍙紪杈�
+ private Boolean isEdit;
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
+ @Schema(description = "鏄惁鏈夌敓浜ц褰�")
+ @TableField(exist = false)
+ private Boolean hasProductionRecord;
+
+ /**
+ * 閿�鍞被鍨嬶細鍗栨补 / 浠ｅ偍锛堝崠瀛樺偍浣嶇疆锛�
+ * 娉ㄦ剰锛氫笉瑕佷笌瀛愯〃琛岀殑 SaleEnum(type) 娣风敤锛岄偅鏄攢鍞�/閲囪喘/椤圭洰
+ */
+ @Schema(description = "閿�鍞被鍨嬶細鍗栨补/浠ｅ偍")
+ @Excel(name = "閿�鍞被鍨�")
+ private String ledgerType;
+
+ @Schema(description = "娌瑰簱id锛堢被鍨�=浠ｅ偍鏃朵娇鐢級")
+ private Long oilDepotId;
+
+ @Schema(description = "娌瑰簱鍚嶇О")
+ @Excel(name = "娌瑰簱")
+ private String oilDepotName;
+
+ @Schema(description = "鍌ㄧ綈id锛堢被鍨�=浠ｅ偍鏃朵娇鐢級")
+ private Long tankId;
+
+ @Schema(description = "鍌ㄧ綈鍙�")
+ @Excel(name = "鍌ㄧ綈鍙�")
+ private String tankNo;
+
+ @Schema(description = "鍚ㄤ綅锛堢被鍨�=浠ｅ偍鏃朵娇鐢紝閫夊～锛�")
+ @Excel(name = "鍚ㄤ綅")
+ private BigDecimal tonnage;
+
+ @Schema(description = "瀹℃壒鐘舵�侊細寰呭鎵�/瀹℃牳涓�/閫氳繃/鎷掔粷")
+ @Excel(name = "瀹℃壒鐘舵��")
+ private String approvalStatus;
+
+ /**
+ * 瀹㈡埛淇℃墭鍩洪噾锛堟煡璇㈡椂鐢辨湇鍔″眰鎸� customerId 鍥炲～锛屼笉鏄湰琛ㄥ瓧娈碉級
+ */
+ @Schema(description = "瀹㈡埛淇℃墭鍩洪噾")
+ @TableField(exist = false)
+ @Excel(name = "瀹㈡埛淇℃墭鍩洪噾")
+ private BigDecimal trustFund;
+
+ /**
+ * 鏈瑪鍚堝悓閲戦鏄惁瓒呭嚭瀹㈡埛淇℃墭鍩洪噾锛堣秴鍑哄垯鍓嶇鏍囩孩锛屼笉鏄湰琛ㄥ瓧娈碉級
+ */
+ @Schema(description = "鏈瑪鍚堝悓閲戦鏄惁瓒呭嚭瀹㈡埛淇℃墭鍩洪噾")
+ @TableField(exist = false)
+ private Boolean exceedsTrustFund;
+
}
--
Gitblit v1.9.3