From 02d5b44343f3bd9abb667e50ccf469fed9a0a99a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 08 一月 2025 20:43:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 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 c147357..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,28 +81,30 @@
.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")
public ApiResult<Integer> getCurrentByParamLens(@RequestBody GetCurrentByParamLens dto) {
- TLensGoods one = lensGoodsService.lambdaQuery().eq(TLensGoods::getSeriesId, dto.getSeriesId())
+ List<TLensGoods> one = lensGoodsService.lambdaQuery().eq(TLensGoods::getSeriesId, dto.getSeriesId())
.eq(dto.getLensType()!=null,TLensGoods::getLensType, dto.getLensType())
.eq(StringUtils.hasLength(dto.getRefractiveIndex()),TLensGoods::getRefractiveIndex, dto.getRefractiveIndex())
.eq(StringUtils.hasLength(dto.getBallMirror()),TLensGoods::getBallMirror, dto.getBallMirror())
.eq(StringUtils.hasLength(dto.getColumnMirror()),TLensGoods::getColumnMirror, dto.getColumnMirror())
.eq(dto.getStoreId()!=null,TLensGoods::getStoreId, dto.getStoreId())
- .one();
- if (one!=null){
- return ApiResult.success(one.getTotal());
- }
- return ApiResult.success(0);
+ .list();
+ if (one.isEmpty())return ApiResult.success(0);
+ Integer temp = one.stream()
+ .mapToInt(TLensGoods::getTotal)
+ .sum();
+ return ApiResult.success(temp);
}
@ApiOperation(value = "镜架库存分页列表")
@PostMapping(value = "/frameReceiptList")
@@ -197,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