From 18480213c000dfd7f6f236903f965a4d3f254597 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 09 六月 2026 17:23:46 +0800
Subject: [PATCH] 销售台账列表返回库存类型
---
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index 08bb128..56b1f4c 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -87,6 +87,18 @@
private BigDecimal taxInclusiveTotalPrice;
/**
+ * 杩愯垂鍗曚环
+ */
+ @Excel(name = "杩愯垂鍗曚环")
+ private BigDecimal freightUnitPrice;
+
+ /**
+ * 鎬昏繍璐�
+ */
+ @Excel(name = "鎬昏繍璐�")
+ private BigDecimal totalFreight;
+
+ /**
* 涓嶅惈绋庢�讳环
*/
@Excel(name = "涓嶅惈绋庢�讳环")
@@ -112,6 +124,9 @@
* 浜у搧瑙勬牸id
*/
private Long productModelId;
+
+ @Schema(description = "搴撳瓨绫诲瀷锛歲ualified/waste")
+ private String stockType;
@Schema(description = "鐧昏浜�")
private String register;
@@ -149,6 +164,10 @@
/**
* 浜у搧鐘舵��
*/
+ @TableField(exist = false)
+ @Schema(description = "鍏ュ簱瀹℃牳鐘舵��")
+ private String stockInApprovalStatus;
+
// @TableField(exist = false)
@Schema(description = "浜у搧鐘舵�侊細1-鍏呰冻")
private Integer approveStatus;
@@ -181,4 +200,8 @@
@TableField(exist = false)
@Schema(description = "寰呭彂璐ф暟閲�")
private BigDecimal noQuantity;
+
+ @TableField(exist = false)
+ @Schema(description = "瀹℃壒涓暟閲�")
+ private BigDecimal pendingApprovalQuantity;
}
--
Gitblit v1.9.3