From 833a285ef00a84fc1a88464eb3d7d1934cf71ff6 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 23 四月 2026 14:45:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子

---
 src/main/java/com/ruoyi/sales/pojo/SalesLedger.java |   75 ++++++++++++++++++++++++++++---------
 1 files changed, 56 insertions(+), 19 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..519fd8a 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -1,15 +1,16 @@
 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 lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 閿�鍞彴璐﹀璞� sales_ledger
@@ -37,23 +38,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 +131,55 @@
     @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;
+
+    @TableField(exist = false)
+    //鏄惁鍙紪杈�
+    private Boolean isEdit;
+
+    /**
+     * 瀹㈡埛鍦板潃
+     */
+    @TableField(exist = false)
+    private String companyAddress;
+
+    /**
+     * 瀹㈡埛鑱旂郴鐢佃瘽
+     */
+    @TableField(exist = false)
+    private String contactPhone;
+
+    /**
+     * 瀹㈡埛鑱旂郴浜�
+     */
+    @TableField(exist = false)
+    private String contactPerson;
+
+    /**
+     * 瀹㈡埛鍏徃鐢佃瘽
+     */
+    @TableField(exist = false)
+    private String companyPhone;
+
+    @TableField(exist = false)
+    private List<SalesLedgerProduct> productList;
+
+    /**
+     * 鏄惁鐢熶骇
+     */
+    @ApiModelProperty(value = "鏄惁鐢熶骇")
+    private boolean isProduce;
 }
 

--
Gitblit v1.9.3