From 9e33d74a62e8b2b37c2f1c290a88392d352e8ece Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 03 四月 2026 10:57:59 +0800
Subject: [PATCH] yys

---
 src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java |   87 ++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 77 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index 8eacb60..7515c2a 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -12,6 +12,7 @@
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 浜у搧淇℃伅瀵硅薄 sales_ledger_product
@@ -22,7 +23,12 @@
 @TableName("sales_ledger_product")
 @Data
 public class SalesLedgerProduct implements Serializable {
+
     private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "搴撲綅")
+    @TableField(exist = false)
+    private String stockLocation;
 
     /**
      * 浜у搧淇℃伅涓婚敭
@@ -48,9 +54,9 @@
     private String productCategory;
 
     /**
-     * 瑙勬牸鍨嬪彿
+     * 鍥剧焊缂栧彿
      */
-    @Excel(name = "瑙勬牸鍨嬪彿")
+    @Excel(name = "鍥剧焊缂栧彿")
     private String specificationModel;
 
     /**
@@ -110,34 +116,34 @@
     /**
      * 鏈鏉ョエ鏁�
      */
-    private BigDecimal ticketsNum;
+    private BigDecimal ticketsNum=BigDecimal.ZERO;
 
     /**
      * 鏈鏉ョエ閲戦(鍏�)
      */
-    private BigDecimal ticketsAmount;
+    private BigDecimal ticketsAmount=BigDecimal.ZERO;
 
     /**
      * 鏈潵绁ㄦ暟
      */
-    private BigDecimal futureTickets;
+    private BigDecimal futureTickets=BigDecimal.ZERO;
 
     /**
      * 鏈潵绁ㄩ噾棰�(鍏�)
      */
-    private BigDecimal futureTicketsAmount;
+    private BigDecimal futureTicketsAmount=BigDecimal.ZERO;
 
     @ApiModelProperty(value = "寮�绁ㄦ暟")
-    private BigDecimal invoiceNum;
+    private BigDecimal invoiceNum = BigDecimal.ZERO;
 
     @ApiModelProperty(value = "鏈紑绁ㄦ暟")
-    private BigDecimal noInvoiceNum;
+    private BigDecimal noInvoiceNum = BigDecimal.ZERO;
 
     @ApiModelProperty(value = "寮�绁ㄩ噾棰�")
-    private BigDecimal invoiceAmount;
+    private BigDecimal invoiceAmount = BigDecimal.ZERO;
 
     @ApiModelProperty(value = "鏈紑绁ㄩ噾棰�")
-    private BigDecimal noInvoiceAmount;
+    private BigDecimal noInvoiceAmount = BigDecimal.ZERO;
 
     @ApiModelProperty(value = "鏈寮�绁ㄦ暟")
     @TableField(exist = false)
@@ -184,4 +190,65 @@
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "鐧昏鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime registerDate;
+    /**
+     * 鍙戣揣杞︾墝鍙�
+     */
+    @Excel(name = "鍙戣揣杞︾墝鍙�")
+    @TableField(exist = false)
+    private String shippingCarNumber;
+
+    @ApiModelProperty("蹇�掑叕鍙�")
+    @TableField(exist = false)
+    private String expressCompany;
+
+    @ApiModelProperty("蹇�掑崟鍙�")
+    @TableField(exist = false)
+    private String expressNumber;
+
+    /**
+     * 鍙戣揣鏃ユ湡
+     */
+    @Excel(name = "鍙戣揣鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date shippingDate;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "鍙戣揣鐘舵��")
+    private String shippingStatus = "寰呭彂璐�";
+    /**
+     * 浜у搧鐘舵��
+     */
+//    @TableField(exist = false)
+    @ApiModelProperty(value = "浜у搧鐘舵�侊細1-鍏呰冻")
+    private Integer approveStatus;
+
+    @ApiModelProperty(value = "寰呭洖娆炬�婚噾棰�")
+    private BigDecimal pendingInvoiceTotal;
+
+    @ApiModelProperty(value = "鍥炴鎬婚噾棰�")
+    private BigDecimal invoiceTotal = BigDecimal.ZERO;
+
+    @ApiModelProperty(value = "寰呬粯娆炬�婚噾棰�")
+    private BigDecimal pendingTicketsTotal;
+
+    @ApiModelProperty(value = "浠樻鎬婚噾棰�")
+    private BigDecimal ticketsTotal = BigDecimal.ZERO;
+
+    @ApiModelProperty(value = "鏄惁璐ㄦ")
+    private Boolean isChecked;
+
+    @TableField(exist = false)
+    private Integer hasSufficientStock;
+
+    @ApiModelProperty(value = "鍙戣揣鏁伴噺")
+    @TableField(exist = false)
+    private BigDecimal shippingNum;
+
+    @ApiModelProperty(value = "閫�璐ф暟閲�")
+    @TableField(exist = false)
+    private BigDecimal returnNum;
+
+    @ApiModelProperty(value = "鐗╂枡鍙�")
+    private String material;
 }

--
Gitblit v1.9.3