From 44ceeeee9cd3f76b0f3a2135421407b73dea9bb0 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 28 八月 2026 11:41:58 +0800
Subject: [PATCH] fix(sales): 修复销售台账发货状态查询逻辑
---
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index d9f8eff..9f050df 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -39,6 +39,17 @@
private Long salesLedgerId;
/**
+ * 鐖舵鏋跺悎鍚屼骇鍝両D
+ */
+ private Long parentProductId;
+
+ /**
+ * 妗嗘灦璁㈠崟浜よ揣鏃ユ湡
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private java.time.LocalDate deliveryDate;
+
+ /**
* 棰勮鏁伴噺
*/
private BigDecimal warnNum;
@@ -164,11 +175,7 @@
@TableField(exist = false)
private Integer hasSufficientStock;
- // 閫�璐ф暟閲�
- @TableField(exist = false)
- private BigDecimal returnQuality;
-
- // 鍙敤鏁伴噺 quantity - returnQuality
+ // 鍙敤鏁伴噺 quantity - returnQuantity
@TableField(exist = false)
private BigDecimal availableQuality;
@Schema(description = "鍒涘缓鐢ㄦ埛")
@@ -187,6 +194,18 @@
private BigDecimal noQuantity;
@TableField(exist = false)
+ @Schema(description = "閫�璐ф暟閲�")
+ private BigDecimal returnQuantity;
+
+ @TableField(exist = false)
+ @Schema(description = "閿�鍞彂璐ф暟閲�")
+ private BigDecimal shippedQuantity;
+
+ @TableField(exist = false)
+ @Schema(description = "宸插鏍稿叆搴撴暟閲�")
+ private BigDecimal approvedStockInNum;
+
+ @TableField(exist = false)
@Schema(description = "瀹℃壒涓暟閲�")
private BigDecimal pendingApprovalQuantity;
}
--
Gitblit v1.9.3