From 18fa07479d3c7f5a9b683ab0f698528d9bd2a9ec Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 21 四月 2026 11:23:53 +0800
Subject: [PATCH] feat: 入库管理、出库台账增加合同号字段；支持合同模糊查询
---
src/main/java/com/ruoyi/sales/pojo/SalesLedger.java | 23 +++++++++++++++++++++--
1 files changed, 21 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 93766d9..692cbfc 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -10,6 +10,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
+import java.util.List;
/**
* 閿�鍞彴璐﹀璞� sales_ledger
@@ -143,10 +144,16 @@
private LocalDate deliveryDate;
/**
- * 鍙戣揣鐘舵�侊細0-鏈彂璐э紝1-宸插彂璐�
+ * 鍙戣揣鐘舵�侊細1-鏈彂璐э紝2-瀹℃壒涓紝3-瀹℃壒涓嶉�氳繃锛�4-瀹℃壒閫氳繃锛�5-宸插彂璐�
*/
- @ApiModelProperty("鍙戣揣鐘舵�侊細0-鏈彂璐э紝1-宸插彂璐�")
+ @ApiModelProperty("鍙戣揣鐘舵�侊細1-鏈彂璐э紝2-瀹℃壒涓紝3-瀹℃壒涓嶉�氳繃锛�4-瀹℃壒閫氳繃锛�5-宸插彂璐�")
private Integer deliveryStatus;
+
+ /**
+ * 鍏ュ簱鐘舵�侊細0-鏈叆搴擄紝1-閮ㄥ垎鍏ュ簱锛�2-宸插叆搴�
+ */
+ @ApiModelProperty("鍏ュ簱鐘舵�侊細0-鏈叆搴擄紝1-閮ㄥ垎鍏ュ簱锛�2-宸插叆搴�")
+ private Integer stockStatus;
@TableField(exist = false)
@ApiModelProperty(value = "浜よ揣澶╂暟宸�")
@@ -159,5 +166,17 @@
@TableField(exist = false)
//鏄惁鍙紪杈�
private Boolean isEdit;
+
+ @TableField(exist = false)
+ @ApiModelProperty("璁㈠崟浜у搧鎬绘暟閲�")
+ private BigDecimal productTotalQuantity = BigDecimal.ZERO;
+
+ @TableField(exist = false)
+ @ApiModelProperty("璁㈠崟浜у搧鎬婚潰绉�(銕�)")
+ private BigDecimal productTotalArea = BigDecimal.ZERO;
+
+ @TableField(exist = false)
+ @ApiModelProperty("鍛戒腑鐨勯攢鍞骇鍝佸垪琛�")
+ private List<SalesLedgerProduct> matchedProducts;
}
--
Gitblit v1.9.3