From c1d251d8c74a9c86e437015d2f1726b120d90fdb Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 23 四月 2026 13:45:48 +0800
Subject: [PATCH] 发货记录增加数量+“库存预警”字段移至库存管理+点击销售合同号自动跳转到销售台账
---
src/main/java/com/ruoyi/sales/pojo/SalesLedger.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
index 500c914..e180abe 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -104,14 +104,16 @@
@TableField(exist = false)
@ApiModelProperty(value = "鏈紑绁ㄩ噾棰�(鍏�)")
- private BigDecimal noInvoiceAmountTotal;
+ @Excel(name = "鏈紑绁ㄩ噾棰�")
+ private BigDecimal noInvoiceAmountTotal = BigDecimal.ZERO;
@ApiModelProperty(value = "绛捐鏃ユ湡")
private LocalDate executionDate;
@TableField(exist = false)
@ApiModelProperty(value = "宸插紑绁ㄩ噾棰�(鍏�)")
- private BigDecimal invoiceTotal;
+ @Excel(name = "宸插紑绁ㄩ噾棰�")
+ private BigDecimal invoiceTotal = BigDecimal.ZERO;
@TableField(exist = false)
@ApiModelProperty(value = "鍥炴閲戦")
@@ -123,5 +125,12 @@
@ApiModelProperty(value = "浠樻鏂瑰紡")
private String paymentMethod;
+
+ @ApiModelProperty(value = "璁㈠崟鎸夌揣鎬ョ▼搴﹀垎绫�(鏅��/绱ф��)")
+ private String salesType;
+
+ @ApiModelProperty(value = "0-寰呭鏍革紝1-瀹℃壒涓紝2-瀹℃壒閫氳繃锛�3-瀹℃壒涓嶉�氳繃锛�4-宸查噸鏂版彁浜�")
+//榛樿鏄�0
+ private Integer approvalStatus;
}
--
Gitblit v1.9.3