From e768a4011f29c75aed636fb6adc5b7e7745a6316 Mon Sep 17 00:00:00 2001
From: lqh <1919773837@qq.com>
Date: Tue, 10 Feb 2026 16:10:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BF=87=E6=9C=9F=E6=8F=90?=
 =?UTF-8?q?=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lims/goods/controller/GoodsController.java     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java
index 9786703..07fc174 100644
--- a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java
+++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java
@@ -122,6 +122,20 @@ public class GoodsController extends BladeController {
             if (CollectionUtils.isNotEmpty(contractDetail)) {
                 goods1.setNotNum(contractDetail.stream().mapToInt(ContractDetail::getNotNum).sum());
             }
+            LambdaQueryWrapper<ProductStoreDetial> timeWrapper = new LambdaQueryWrapper<>();
+            timeWrapper.eq(ProductStoreDetial::getGoodsId, goods1.getId())
+                    .orderByAsc(ProductStoreDetial::getBeyondTime) // 按过期时间降序
+                    .last("LIMIT 1"); // 只取第一条
+
+            ProductStoreDetial detialWithTime = productStoreDetialService.getOne(timeWrapper);
+            if (detialWithTime != null && detialWithTime.getBeyondTime() != null) {
+                // 为Goods对象的beyondtime字段赋值
+                goods1.setBeyondTime(detialWithTime.getBeyondTime());
+            } else {
+                // 无过期时间时赋值为null（或根据业务设置默认值）
+                goods1.setBeyondTime(null);
+            }
+
         }
         return page;
     }