From 9bad4cfca9b9f51f433bf0caf5b5d166d1fc55a7 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 03 四月 2026 10:20:59 +0800
Subject: [PATCH] fix: 库存查询添加有效期
---
src/main/java/com/ruoyi/basic/dto/ProductTreeDto.java | 4 ++++
src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java | 1 +
src/main/resources/mapper/stock/StockInventoryMapper.xml | 3 ++-
src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java | 2 ++
4 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/dto/ProductTreeDto.java b/src/main/java/com/ruoyi/basic/dto/ProductTreeDto.java
index 0829aae..4e8cd2e 100644
--- a/src/main/java/com/ruoyi/basic/dto/ProductTreeDto.java
+++ b/src/main/java/com/ruoyi/basic/dto/ProductTreeDto.java
@@ -2,6 +2,8 @@
import lombok.Data;
+import java.math.BigDecimal;
+import java.time.LocalDate;
import java.util.List;
@Data
@@ -15,6 +17,8 @@
private String uidNo;
private String unit;
private Long productModelId;
+ private LocalDate productionDate;
+ private BigDecimal validityPeriod;
private String label; // 鐢ㄤ簬鏍戝舰缁撴瀯鐨勬樉绀哄悕绉�
private List<ProductTreeDto> children;
private String nodeType;
diff --git a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
index 183f4d5..1cacf58 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
@@ -46,4 +46,5 @@
private Long parentId; // 鐖剁骇浜у搧ID
private Long productModelId; // 浜у搧鍨嬪彿ID
private String productScope; //浜у搧绫诲瀷
+ private BigDecimal validityPeriod; //鏈夋晥鏈�
}
diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
index db3e2b3..8a9a973 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
@@ -399,6 +399,8 @@
String customer = StringUtils.isBlank(stock.getCustomer()) ? "鏃犲鎴�" : stock.getCustomer();
customerNode.setCustomer(customer);
customerNode.setLabel(customer);
+ customerNode.setProductionDate(stock.getProductionDate());
+ customerNode.setValidityPeriod(stock.getValidityPeriod());
customerNode.setNodeType("customer");
customerNode.setChildren(new ArrayList<>());
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 1417395..c67d021 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -360,7 +360,8 @@
p1.product_name AS parentName,
si.batch_no,
si.customer,
- si.production_date
+ si.production_date,
+ pm.validity_period
FROM
stock_inventory si
LEFT JOIN product_model pm ON si.product_model_id = pm.id
--
Gitblit v1.9.3