From bc8d7d4bb290ed84441942d50a0399f3cc034a0c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 20 十二月 2024 15:39:45 +0800
Subject: [PATCH] 代码
---
manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 61366b1..0945238 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java
@@ -70,25 +70,26 @@
public ApiResult<Integer> getCurrentByParamFrame(@RequestBody GetCurrentByParam getCurrentByParam) {
// 根据型号名称 查询型号列表ids
List<Integer> collect = modelService.lambdaQuery().eq(TModel::getName, getCurrentByParam.getModel())
+ .eq(TModel::getMaterialId,getCurrentByParam.getMaterialId())
.eq(TModel::getColor,getCurrentByParam.getColor())
.eq(TModel::getBrandId,getCurrentByParam.getBrandId())
.list().stream().map(TModel::getId).collect(Collectors.toList());
TFrameGoods one = frameGoodsService.lambdaQuery().in(TFrameGoods::getModelId, collect)
- .eq(TFrameGoods::getColor, getCurrentByParam).one();
+ .eq(TFrameGoods::getColor, getCurrentByParam.getColor()).one();
if (one!=null){
return ApiResult.success(one.getTotal());
}
return ApiResult.success(0);
}
- @ApiOperation(value = "镜片-根据品牌id、系列id、球/非球、折射率、球镜、柱镜查询当前库存")
+ @ApiOperation(value = "镜片-根据品牌id、型号名称、色号名称、材质id查询当前库存")
@PostMapping(value = "/getCurrentByParamLens")
public ApiResult<Integer> getCurrentByParamLens(@RequestBody GetCurrentByParamLens dto) {
TLensGoods one = lensGoodsService.lambdaQuery().in(TLensGoods::getSeriesId, dto.getSeriesId())
- .eq(TLensGoods::getLensType, dto.getLensType())
- .eq(TLensGoods::getRefractiveIndex, dto.getRefractiveIndex())
- .eq(TLensGoods::getBallMirror, dto.getBallMirror())
- .eq(TLensGoods::getColumnMirror, dto.getColumnMirror())
+ .eq(dto.getLensType()!=null,TLensGoods::getLensType, dto.getLensType())
+ .eq(dto.getRefractiveIndex()!=null,TLensGoods::getRefractiveIndex, dto.getRefractiveIndex())
+ .eq(dto.getBallMirror()!=null,TLensGoods::getBallMirror, dto.getBallMirror())
+ .eq(dto.getColumnMirror()!=null,TLensGoods::getColumnMirror, dto.getColumnMirror())
.one();
if (one!=null){
return ApiResult.success(one.getTotal());
--
Gitblit v1.7.1