From 2f8e70ad2884d2b6b7443dfae0af11ae9cfc8b99 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 28 二月 2025 17:44:10 +0800
Subject: [PATCH] bug修改
---
manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java b/manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java
index 4e5c1b9..40be5e6 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java
@@ -166,6 +166,18 @@
@ApiOperation(value = "镜片出入库记录列表")
@PostMapping(value = "/detailLensList")
public ApiResult<PageInfo<TLensWarehousingDetailVO>> detailLensList(@RequestBody TWarehousingDetailLensQuery query) {
+ if (query.getSeriesId()!=null){
+ TLensSeries series = lensSeriesService.getById(query.getSeriesId());
+ if (series!=null){
+ query.setSeries(series.getName());
+ }
+ }
+ if (query.getBrandId()!=null){
+ TBrand brand = brandService.getById(query.getBrandId());
+ if (brand!=null){
+ query.setBrand(brand.getName());
+ }
+ }
return ApiResult.success(warehousingService.detailListLens(query));
}
/**
@@ -363,6 +375,10 @@
List<TFrameWarehousingDetail> list = frameWarehousingDetailService.list(Wrappers.lambdaQuery(TFrameWarehousingDetail.class)
.eq(TFrameWarehousingDetail::getWarehousingId, id));
vo.setFrameWarehousingDetails(list);
+ TStore store = storeService.getById(warehousing.getStoreId());
+ if (store!=null){
+ vo.setStoreName(store.getName());
+ }
// 统计数量
vo.setTotalNum(list.stream().mapToInt(TFrameWarehousingDetail::getTotal).sum());
return ApiResult.success(vo);
@@ -375,6 +391,10 @@
BeanUtils.copyProperties(warehousing, vo);
List<TLensWarehousingDetail> list = lensWarehousingDetailService.list(Wrappers.lambdaQuery(TLensWarehousingDetail.class)
.eq(TLensWarehousingDetail::getWarehousingId, id));
+ TStore store = storeService.getById(warehousing.getStoreId());
+ if (store!=null){
+ vo.setStoreName(store.getName());
+ }
vo.setLensWarehousingDetails(list);
// 统计数量
vo.setTotalNum(list.stream().mapToInt(TLensWarehousingDetail::getTotal).sum());
--
Gitblit v1.7.1