From 2d13c1e3049653f435285e02740378384e36b1e8 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期五, 24 四月 2026 13:01:47 +0800
Subject: [PATCH] 文件工具类变更
---
src/main/java/com/ruoyi/sales/pojo/SalesLedger.java | 62 +++++++++++++++++++------------
1 files changed, 38 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
index 955f4da..bc4d02c 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -7,7 +7,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -37,23 +37,9 @@
/**
* 瀹㈡埛鍚堝悓鍙�
*/
- @Excel(name = "瀹㈡埛鍚堝悓鍙�")
+ @Excel(name = "瀹㈡埛鍚堝悓鍙�", type = Excel.Type.IMPORT)
private String customerContractNo;
- /**
- * 鍙戣揣杞︾墝鍙�
- */
- @Excel(name = "鍙戣揣杞︾墝鍙�")
- @TableField(exist = false)
- private String shippingCarNumber;
-
- /**
- * 鍙戣揣鏃ユ湡
- */
- @Excel(name = "鍙戣揣鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
- @TableField(exist = false)
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date shippingDate;
/**
* 椤圭洰鍚嶇О
@@ -92,7 +78,7 @@
private String entryPerson;
@TableField(exist = false)
- @ApiModelProperty(value = "褰曞叆浜�")
+ @Schema(description = "褰曞叆浜�")
@Excel(name = "褰曞叆浜�")
private String entryPersonName;
@@ -118,31 +104,59 @@
private BigDecimal contractAmount;
@TableField(exist = false)
- @ApiModelProperty(value = "鏈紑绁ㄩ噾棰�(鍏�)")
+ @Schema(description = "鏈紑绁ㄩ噾棰�(鍏�)")
@Excel(name = "鏈紑绁ㄩ噾棰�")
private BigDecimal noInvoiceAmountTotal = BigDecimal.ZERO;
- @ApiModelProperty(value = "绛捐鏃ユ湡")
+ @Schema(description = "绛捐鏃ユ湡")
private LocalDate executionDate;
@TableField(exist = false)
- @ApiModelProperty(value = "宸插紑绁ㄩ噾棰�(鍏�)")
+ @Schema(description = "宸插紑绁ㄩ噾棰�(鍏�)")
@Excel(name = "宸插紑绁ㄩ噾棰�")
private BigDecimal invoiceTotal = BigDecimal.ZERO;
@TableField(exist = false)
- @ApiModelProperty(value = "鍥炴閲戦")
+ @Schema(description = "鍥炴閲戦")
private BigDecimal receiptPaymentAmountTotal = BigDecimal.ZERO;
@TableField(exist = false)
- @ApiModelProperty(value = "寰呭洖娆鹃噾棰�")
+ @Schema(description = "寰呭洖娆鹃噾棰�")
private BigDecimal noReceiptAmount = BigDecimal.ZERO;
- @ApiModelProperty(value = "浠樻鏂瑰紡")
+ @Schema(description = "浠樻鏂瑰紡")
private String paymentMethod;
@TableField(exist = false)
- @ApiModelProperty(value = "鐢熶骇鐘舵��")
+ @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;
+
}
--
Gitblit v1.9.3