From 635262464177d1bdf5becc6d37c20ec1e1d48539 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 09 一月 2025 11:47:19 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes
---
manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 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 e413752..b7307a5 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java
@@ -81,13 +81,14 @@
.eq(Objects.nonNull(getCurrentByParam.getBrandId()),TModel::getBrandId,getCurrentByParam.getBrandId())
.list().stream().map(TModel::getId).collect(Collectors.toList());
if (collect.isEmpty())collect.add(-1);
- TFrameGoods one = frameGoodsService.lambdaQuery().in(TFrameGoods::getModelId, collect)
+ List<TFrameGoods> one = frameGoodsService.lambdaQuery().in(TFrameGoods::getModelId, collect)
.eq(TFrameGoods::getColor, getCurrentByParam.getColor())
- .eq(TFrameGoods::getStoreId, getCurrentByParam.getStoreId()).one();
- if (one!=null){
- return ApiResult.success(one.getTotal());
- }
- return ApiResult.success(0);
+ .eq(TFrameGoods::getStoreId, getCurrentByParam.getStoreId()).list();
+ if (one.isEmpty())return ApiResult.success(0);
+ Integer temp = one.stream()
+ .mapToInt(TFrameGoods::getTotal)
+ .sum();
+ return ApiResult.success(temp);
}
@ApiOperation(value = "镜片-根据系列id、球/非球、品牌id、折射率、ballMirror、columnMirror查询当前库存")
@PostMapping(value = "/getCurrentByParamLens")
@@ -198,8 +199,8 @@
tLensGoodsDetailVO.setTitle(byId3.getName()+byId2.getName()+t1+" "+byId.getRefractiveIndex());
}
// 查询这个商品的库存明细
- List<TLensWarehousingDetail> list = lensWarehousingDetailService.lambdaQuery().eq(TLensWarehousingDetail::getSeriesId, byId.getSeriesId())
- .eq(TLensWarehousingDetail::getRefractiveIndex, byId.getRefractiveIndex()).list();
+ List<TLensGoods> list = lensGoodsService.lambdaQuery().eq(TLensGoods::getSeriesId, byId.getSeriesId())
+ .eq(TLensGoods::getRefractiveIndex, byId.getRefractiveIndex()).list();
tLensGoodsDetailVO.setList(list);
return ApiResult.success(tLensGoodsDetailVO);
}
--
Gitblit v1.7.1