From c7bd2e8a92a57094040d6a5ffb5f30b8b8d8b43a Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 03 二月 2026 15:00:40 +0800
Subject: [PATCH] fix: 修复供应商往来账目在无付款时仍显示合同记录

---
 src/main/java/com/ruoyi/sales/pojo/SalesLedger.java |   29 ++++++++++++++---------------
 1 files changed, 14 insertions(+), 15 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..672fe75 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -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;
 
     /**
      * 椤圭洰鍚嶇О
@@ -144,5 +130,18 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "鐢熶骇鐘舵��")
     private String productionStatus = "鏈紑濮�";
+
+    //浜よ揣鏃ユ湡
+    @ApiModelProperty(value = "浜よ揣鏃ユ湡")
+    @TableField(value = "delivery_date")
+    private LocalDate deliveryDate;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "浜よ揣澶╂暟宸�")
+    private Integer deliveryDaysDiff;
+
+    @TableField(exist = false)
+    //鏄惁鍙戣揣(鍙拌处椤甸潰棰滆壊鎺у埗)
+    private Boolean isFh;
 }
 

--
Gitblit v1.9.3