From 74a29854bb8ff92d2ff2fcb55fa5028609ec6a33 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 14 七月 2026 15:26:47 +0800
Subject: [PATCH] 采购删除导致审批报错+发货台账导入关联销售台账+生成出库记录

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

diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index 4c04ce6..4c28c1f 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -12,7 +12,6 @@
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * 浜у搧淇℃伅瀵硅薄 sales_ledger_product
@@ -129,16 +128,16 @@
     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,22 +191,30 @@
     @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;
+    private LocalDateTime 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宸插彂璐�")
+    @ApiModelProperty(value = "浜у搧鐘舵�侊細1-鍏呰冻")
     private Integer approveStatus;
 
     @ApiModelProperty(value = "寰呭洖娆炬�婚噾棰�")
@@ -224,4 +231,43 @@
 
     @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 = "鍗曚环锛堝绉佷笓鐢級")
+    @Excel(name = "鍗曚环锛堝绉侊級")
+    private BigDecimal unitPrice;
+
+    /**
+     * 鎬讳环锛堝绉佷笓鐢級
+     */
+    @ApiModelProperty(value = "鎬讳环锛堝绉佷笓鐢級")
+    @Excel(name = "鎬讳环锛堝绉侊級")
+    private BigDecimal totalPrice;
+
+    /**
+     * 杩愯垂
+     */
+    @ApiModelProperty(value = "杩愯垂")
+    @Excel(name = "杩愯垂")
+    private BigDecimal freight = BigDecimal.ZERO;
+
+    /**
+     * 鍚繍璐瑰崟浠�
+     */
+    @ApiModelProperty(value = "鍚繍璐瑰崟浠�")
+    @Excel(name = "鍚繍璐瑰崟浠�")
+    private BigDecimal priceWithFreight;
 }

--
Gitblit v1.9.3