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/SalesLedgerProduct.java |   76 ++++++++++++++++++++++++++++++++------
 1 files changed, 64 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index f35b916..299ac3f 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -13,6 +13,7 @@
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 浜у搧淇℃伅瀵硅薄 sales_ledger_product
@@ -49,6 +50,13 @@
     private String productCategory;
 
     /**
+     * 鐗╂枡缂栧彿
+     */
+    @Excel(name = "鐗╂枡缂栧彿")
+    @TableField(exist = false)
+    private String materialCode;
+
+    /**
      * 瑙勬牸鍨嬪彿
      */
     @Excel(name = "瑙勬牸鍨嬪彿")
@@ -71,8 +79,13 @@
      */
     @Excel(name = "鏁伴噺")
     private BigDecimal quantity;
+
+    /**
+     * 鏈�浣庡簱瀛樻暟閲�
+     */
     @Excel(name = "鏈�浣庡簱瀛樻暟閲�")
     private BigDecimal minStock;
+
     /**
      * 绋庣巼
      */
@@ -111,34 +124,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)
@@ -192,6 +205,14 @@
     @TableField(exist = false)
     private String shippingCarNumber;
 
+    @ApiModelProperty("蹇�掑叕鍙�")
+    @TableField(exist = false)
+    private String expressCompany;
+
+    @ApiModelProperty("蹇�掑崟鍙�")
+    @TableField(exist = false)
+    private String expressNumber;
+
     /**
      * 鍙戣揣鏃ユ湡
      */
@@ -201,12 +222,43 @@
     private Date shippingDate;
 
     @TableField(exist = false)
-    @ApiModelProperty(value = "鐢熶骇鐘舵��")
-    private String productionStatus = "鏈紑濮�";
+    @ApiModelProperty(value = "鍙戣揣鐘舵��")
+    private String shippingStatus = "寰呭彂璐�";
     /**
-     * 鍙戣揣瀹℃壒鐘舵��
+     * 浜у搧鐘舵��
      */
 //    @TableField(exist = false)
-    @ApiModelProperty(value = "瀹℃壒鐘舵��")
+    @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("搴忓彿")
+    @TableField(exist = false)
+    @Excel(name = "搴忓彿")
+    private Integer serialNumber;
+
+    @ApiModelProperty("璁㈠崟鍙�")
+    @Excel(name = "璁㈠崟鍙�")
+    @TableField(exist = false)
+    private String orderNo;
+
+    @ApiModelProperty("鎵瑰彿")
+    private String batchNo;
 }

--
Gitblit v1.9.3