From b5bec73f81de6bdfb30c69a7259b11f945802015 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 30 十二月 2024 17:27:44 +0800
Subject: [PATCH] 小程序
---
manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 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 2666743..c1e09dc 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java
@@ -24,6 +24,7 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -32,6 +33,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -68,24 +70,25 @@
/**
* 通过型号查询色号列表
*/
- @ApiOperation(value = "镜架-根据品牌id、型号名称、色号名称查询当前库存")
+ @ApiOperation(value = "镜架-根据品牌id、型号名称、色号名称、材质id查询当前库存")
@PostMapping(value = "/getCurrentByParamFrame")
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<Integer> collect = modelService.lambdaQuery()
+ .eq(StringUtils.hasLength(getCurrentByParam.getModel()),TModel::getName, getCurrentByParam.getModel())
+ .eq(Objects.nonNull(getCurrentByParam.getMaterialId()),TModel::getMaterialId,getCurrentByParam.getMaterialId())
+ .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());
TFrameGoods one = frameGoodsService.lambdaQuery().in(TFrameGoods::getModelId, collect)
- .eq(TFrameGoods::getColor, getCurrentByParam.getColor()).one();
+ .eq(TFrameGoods::getColor, getCurrentByParam.getColor())
+ .eq(TFrameGoods::getStoreId, getCurrentByParam.getStoreId()).one();
if (one!=null){
return ApiResult.success(one.getTotal());
-
}
return ApiResult.success(0);
}
- @ApiOperation(value = "镜片-根据品牌id、型号名称、色号名称、材质id查询当前库存")
+ @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())
@@ -93,6 +96,7 @@
.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(dto.getStoreId()!=null,TLensGoods::getStoreId, dto.getStoreId())
.one();
if (one!=null){
return ApiResult.success(one.getTotal());
@@ -118,6 +122,7 @@
}else {
byId.setStatus(1);
}
+ lensGoodsService.updateById(byId);
return ApiResult.success();
}
@ApiOperation(value = "镜架库存分页列表-启用禁用")
@@ -129,6 +134,7 @@
}else {
byId.setStatus(1);
}
+ frameGoodsService.updateById(byId);
return ApiResult.success();
}
/**
@@ -154,12 +160,17 @@
PageInfo<TFrameWarehousingDetailVO> frameWarehousingDetailVOPageInfo = warehousingService.detailList(query);
return ApiResult.success(frameWarehousingDetailVOPageInfo);
}
+ @ApiOperation(value = "镜片出入库记录列表")
+ @PostMapping(value = "/detailLensList")
+ public ApiResult<PageInfo<TLensWarehousingDetailVO>> detailLensList(@RequestBody TWarehousingDetailLensQuery query) {
+ return ApiResult.success(warehousingService.detailListLens(query));
+ }
/**
* 库存明细记录列表
*/
@ApiOperation(value = "镜片库存明细记录列表--库存详情")
- @PostMapping(value = "/detailLensList")
- public ApiResult<TLensGoodsDetailVO> detailLensList(Integer id) {
+ @PostMapping(value = "/detailLensListDetail")
+ public ApiResult<TLensGoodsDetailVO> detailLensListDetail(Integer id) {
TLensGoodsDetailVO tLensGoodsDetailVO = new TLensGoodsDetailVO();
TLensGoods byId = lensGoodsService.getById(id);
TStore byId1 = storeService.getById(byId.getStoreId());
--
Gitblit v1.7.1