From 66449e204698bcffd9319eb3f5eaed0dd44ec75f Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 25 十二月 2024 17:18:00 +0800
Subject: [PATCH] 短信
---
manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java | 88 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 76 insertions(+), 12 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 b983a81..6cf722f 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java
@@ -8,6 +8,7 @@
import com.jilongda.common.enums.WarehousingTypeEnum;
import com.jilongda.common.security.JwtTokenUtils;
import com.jilongda.common.utils.CodeGenerateUtils;
+import com.jilongda.common.utils.UUIDUtil;
import com.jilongda.manage.dto.GetCurrentByParam;
import com.jilongda.manage.dto.GetCurrentByParamLens;
import com.jilongda.manage.dto.TWarehousingDTO;
@@ -26,8 +27,10 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -58,33 +61,38 @@
private TModelService modelService;
@Autowired
private TLensSeriesService lensSeriesService;
+ @Autowired
+ private TStoreService storeService;
+ @Autowired
+ private TBrandService brandService;
/**
* 通过型号查询色号列表
*/
- @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().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、折射率、ballMirror、columnMirror查询当前库存")
@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());
@@ -100,6 +108,30 @@
@PostMapping(value = "/lensReceiptList")
public ApiResult<PageInfo<TLensGoodsVO>> lensReceiptList(@RequestBody TLensGoodsQuery query) {
return ApiResult.success(lensGoodsService.lensReceiptList(query));
+ }
+ @ApiOperation(value = "镜片库存分页列表-启用禁用")
+ @PostMapping(value = "/updateStateLens")
+ public ApiResult updateStateLens(Integer id) {
+ TLensGoods byId = lensGoodsService.getById(id);
+ if (byId.getStatus()==1){
+ byId.setStatus(2);
+ }else {
+ byId.setStatus(1);
+ }
+ lensGoodsService.updateById(byId);
+ return ApiResult.success();
+ }
+ @ApiOperation(value = "镜架库存分页列表-启用禁用")
+ @PostMapping(value = "/updateStateFrame")
+ public ApiResult updateStateFrame(Integer id) {
+ TFrameGoods byId = frameGoodsService.getById(id);
+ if (byId.getStatus()==1){
+ byId.setStatus(2);
+ }else {
+ byId.setStatus(1);
+ }
+ frameGoodsService.updateById(byId);
+ return ApiResult.success();
}
/**
* 出入库单列表
@@ -124,14 +156,46 @@
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<PageInfo<TLensWarehousingDetailVO>> detailLensList(@RequestBody TWarehousingDetailLensQuery query) {
- PageInfo<TLensWarehousingDetailVO> frameWarehousingDetailVOPageInfo = warehousingService.detailListLens(query);
- return ApiResult.success(frameWarehousingDetailVOPageInfo);
+ @ApiOperation(value = "镜片库存明细记录列表--库存详情")
+ @PostMapping(value = "/detailLensListDetail")
+ public ApiResult<TLensGoodsDetailVO> detailLensListDetail(Integer id) {
+ TLensGoodsDetailVO tLensGoodsDetailVO = new TLensGoodsDetailVO();
+ TLensGoods byId = lensGoodsService.getById(id);
+ TStore byId1 = storeService.getById(byId.getStoreId());
+ if (byId1!=null){
+ tLensGoodsDetailVO.setStoreName(byId1.getName());
+ }
+ TLensSeries byId2 = lensSeriesService.getById(byId.getSeriesId());
+ if (byId2!=null){
+ Integer brandId = byId2.getBrandId();
+ TBrand byId3 = brandService.getById(brandId);
+ String t1 = "";
+ switch (byId.getLensType()){
+ case 1:
+ t1="球面";
+ break;
+ case 2:
+ t1="非球面";
+ break;
+ case 3:
+ t1="双非";
+ break;
+ }
+ 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();
+ tLensGoodsDetailVO.setList(list);
+ return ApiResult.success(tLensGoodsDetailVO);
}
/**
--
Gitblit v1.7.1