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 | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index 3966071..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
@@ -192,17 +191,25 @@
@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 shippingStatus;
+ private String shippingStatus = "寰呭彂璐�";
/**
* 浜у搧鐘舵��
*/
@@ -227,4 +234,40 @@
@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