From 1ca5584d7e3200a9af65a099bd26d3593e2ba702 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 07 五月 2026 14:36:08 +0800
Subject: [PATCH] 迁移pro

---
 src/main/java/com/ruoyi/sales/pojo/SalesLedger.java |   66 ++++++++++++++++++++++++++++++--
 1 files changed, 61 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
index 472c53b..bc4d02c 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -1,13 +1,15 @@
 package com.ruoyi.sales.pojo;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 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.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 閿�鍞彴璐﹀璞� sales_ledger
@@ -35,8 +37,9 @@
     /**
      * 瀹㈡埛鍚堝悓鍙�
      */
-    @Excel(name = "瀹㈡埛鍚堝悓鍙�")
+    @Excel(name = "瀹㈡埛鍚堝悓鍙�", type = Excel.Type.IMPORT)
     private String customerContractNo;
+
 
     /**
      * 椤圭洰鍚嶇О
@@ -49,6 +52,7 @@
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "褰曞叆鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date entryDate;
 
     /**
@@ -74,7 +78,7 @@
     private String entryPerson;
 
     @TableField(exist = false)
-    @ApiModelProperty(value = "褰曞叆浜�")
+    @Schema(description = "褰曞叆浜�")
     @Excel(name = "褰曞叆浜�")
     private String entryPersonName;
 
@@ -100,7 +104,59 @@
     private BigDecimal contractAmount;
 
     @TableField(exist = false)
-    @ApiModelProperty(value = "鏈紑绁ㄩ噾棰�(鍏�)")
-    private BigDecimal noInvoiceAmountTotal;
+    @Schema(description = "鏈紑绁ㄩ噾棰�(鍏�)")
+    @Excel(name = "鏈紑绁ㄩ噾棰�")
+    private BigDecimal noInvoiceAmountTotal = BigDecimal.ZERO;
+
+    @Schema(description = "绛捐鏃ユ湡")
+    private LocalDate executionDate;
+
+    @TableField(exist = false)
+    @Schema(description = "宸插紑绁ㄩ噾棰�(鍏�)")
+    @Excel(name = "宸插紑绁ㄩ噾棰�")
+    private BigDecimal invoiceTotal = BigDecimal.ZERO;
+
+    @TableField(exist = false)
+    @Schema(description = "鍥炴閲戦")
+    private BigDecimal receiptPaymentAmountTotal = BigDecimal.ZERO;
+
+    @TableField(exist = false)
+    @Schema(description = "寰呭洖娆鹃噾棰�")
+    private BigDecimal noReceiptAmount = BigDecimal.ZERO;
+
+    @Schema(description = "浠樻鏂瑰紡")
+    private String paymentMethod;
+
+    @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;
+
 }
 

--
Gitblit v1.9.3