From 8b68e5a8d8d43bcb45c9032c3eb893a2b8995acf Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 17 四月 2026 16:18:51 +0800
Subject: [PATCH] fix(customer): 修复客户私海相关查询和导入功能

---
 src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java |   68 +++++++++++++++++++++++++++------
 1 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index c4e21b2..34aa729 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -1,5 +1,6 @@
 package com.ruoyi.sales.pojo;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -111,34 +112,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 +193,14 @@
     @TableField(exist = false)
     private String shippingCarNumber;
 
+    @ApiModelProperty("蹇�掑叕鍙�")
+    @TableField(exist = false)
+    private String expressCompany;
+
+    @ApiModelProperty("蹇�掑崟鍙�")
+    @TableField(exist = false)
+    private String expressNumber;
+
     /**
      * 鍙戣揣鏃ユ湡
      */
@@ -200,13 +209,46 @@
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date shippingDate;
 
-//    @TableField(exist = false)
-//    @ApiModelProperty(value = "鐢熶骇鐘舵��")
-//    private String productionStatus = "鏈紑濮�";
+    @TableField(exist = false)
+    @ApiModelProperty(value = "鍙戣揣鐘舵��")
+    private String shippingStatus = "寰呭彂璐�";
     /**
-     * 鍙戣揣瀹℃壒鐘舵��
+     * 浜у搧鐘舵��
      */
 //    @TableField(exist = false)
-    @ApiModelProperty(value = "瀹℃壒鐘舵�侊細0鏈敓浜�,1宸茬敓浜�,2寰呭鏍�(瀹℃牳涓�),3瀹℃牳瀹屾垚,4瀹℃牳澶辫触")
+    @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;
+
+    // 閫�璐ф暟閲�
+    @TableField(exist = false)
+    private BigDecimal returnQuality;
+
+    // 鍙敤鏁伴噺  quantity - returnQuality
+    @TableField(exist = false)
+    private BigDecimal availableQuality;
+    @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer createUser;
+
+    @TableField(fill = FieldFill.INSERT)
+    private Long deptId;
+
 }

--
Gitblit v1.9.3