From f21f290b0605ae71d0690d6ad2574e24aa2d39f1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 08 一月 2025 11:39:42 +0800
Subject: [PATCH] bug修改
---
manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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 c1e09dc..c147357 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java
@@ -80,6 +80,7 @@
.eq(StringUtils.hasLength(getCurrentByParam.getColor()),TModel::getColor,getCurrentByParam.getColor())
.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)
.eq(TFrameGoods::getColor, getCurrentByParam.getColor())
.eq(TFrameGoods::getStoreId, getCurrentByParam.getStoreId()).one();
@@ -91,11 +92,11 @@
@ApiOperation(value = "镜片-根据系列id、球/非球、品牌id、折射率、ballMirror、columnMirror查询当前库存")
@PostMapping(value = "/getCurrentByParamLens")
public ApiResult<Integer> getCurrentByParamLens(@RequestBody GetCurrentByParamLens dto) {
- TLensGoods one = lensGoodsService.lambdaQuery().in(TLensGoods::getSeriesId, dto.getSeriesId())
+ TLensGoods one = lensGoodsService.lambdaQuery().eq(TLensGoods::getSeriesId, dto.getSeriesId())
.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())
+ .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){
@@ -225,6 +226,7 @@
List<TFrameGoods> list1 = new ArrayList<>();
for (TFrameWarehousingDetail frameWarehousingDetail : frameWarehousingDetails) {
TFrameGoods one = frameGoodsService.lambdaQuery().eq(TFrameGoods::getModelId, frameWarehousingDetail.getModelId())
+ .eq(TFrameGoods::getStoreId, dto.getStoreId())
.eq(TFrameGoods::getColor, frameWarehousingDetail.getColor()).one();
if (one!=null){
if (one.getTotal()-frameWarehousingDetail.getTotal()<0){
@@ -233,6 +235,9 @@
// 增加对应库存
one.setTotal(one.getTotal()-frameWarehousingDetail.getTotal());
list1.add(one);
+ }else {
+ return ApiResult.failed("商品不存在");
+
}
}
if (!list1.isEmpty())frameGoodsService.updateBatchById(list1);
@@ -244,6 +249,7 @@
List<TFrameGoods> list2 = new ArrayList<>();
for (TFrameWarehousingDetail frameWarehousingDetail : frameWarehousingDetails) {
TFrameGoods one = frameGoodsService.lambdaQuery().eq(TFrameGoods::getModelId, frameWarehousingDetail.getModelId())
+ .eq(TFrameGoods::getStoreId, dto.getStoreId())
.eq(TFrameGoods::getColor, frameWarehousingDetail.getColor()).one();
if (one!=null){
// 增加对应库存
@@ -291,6 +297,7 @@
.eq(TLensGoods::getLensType, frameWarehousingDetail.getType())
.eq(TLensGoods::getBallMirror, frameWarehousingDetail.getBallMirror())
.eq(TLensGoods::getColumnMirror, frameWarehousingDetail.getColumnMirror())
+ .eq(TLensGoods::getStoreId, dto.getStoreId())
.one();
if (one!=null){
if (one.getTotal()-frameWarehousingDetail.getTotal()<0){
@@ -299,6 +306,9 @@
// 减少对应库存
one.setTotal(one.getTotal()-frameWarehousingDetail.getTotal());
list1.add(one);
+ }else {
+ return ApiResult.failed("商品不存在");
+
}
}
if (!list1.isEmpty())lensGoodsService.updateBatchById(list1);
@@ -313,7 +323,7 @@
.eq(TLensGoods::getRefractiveIndex, frameWarehousingDetail.getRefractiveIndex())
.eq(TLensGoods::getBallMirror, frameWarehousingDetail.getBallMirror())
.eq(TLensGoods::getLensType, frameWarehousingDetail.getType())
-
+ .eq(TLensGoods::getStoreId, dto.getStoreId())
.eq(TLensGoods::getColumnMirror, frameWarehousingDetail.getColumnMirror())
.one();
if (one!=null){
--
Gitblit v1.7.1