From 87630e05daa721f9f742787db0d7b9749d8c2649 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 19 十二月 2024 16:20:46 +0800
Subject: [PATCH] 代码
---
manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java | 100 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 99 insertions(+), 1 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 a1633ed..e33ac8f 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java
@@ -9,12 +9,20 @@
import com.jilongda.common.security.JwtTokenUtils;
import com.jilongda.common.utils.CodeGenerateUtils;
import com.jilongda.manage.dto.TWarehousingDTO;
+import com.jilongda.manage.dto.TWarehousingLensDTO;
+import com.jilongda.manage.model.TFrameGoods;
import com.jilongda.manage.model.TFrameWarehousingDetail;
+import com.jilongda.manage.model.TLensWarehousingDetail;
import com.jilongda.manage.model.TWarehousing;
+import com.jilongda.manage.query.TWarehousingDetailLensQuery;
import com.jilongda.manage.query.TWarehousingDetailQuery;
+import com.jilongda.manage.service.TFrameGoodsService;
import com.jilongda.manage.service.TFrameWarehousingDetailService;
+import com.jilongda.manage.service.TLensWarehousingDetailService;
import com.jilongda.manage.service.TWarehousingService;
import com.jilongda.manage.vo.TFrameWarehousingDetailVO;
+import com.jilongda.manage.vo.TLensWarehousingDetailVO;
+import com.jilongda.manage.vo.TWarehousingLensVO;
import com.jilongda.manage.vo.TWarehousingVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -24,6 +32,7 @@
import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -43,6 +52,10 @@
private TWarehousingService warehousingService;
@Autowired
private TFrameWarehousingDetailService frameWarehousingDetailService;
+ @Autowired
+ private TLensWarehousingDetailService lensWarehousingDetailService;
+ @Autowired
+ private TFrameGoodsService frameGoodsService;
/**
* 出入库单列表
@@ -51,6 +64,11 @@
@PostMapping(value = "/inventoryReceiptList")
public ApiResult<PageInfo<TWarehousingVO>> inventoryReceiptList(@RequestBody TWarehousingDetailQuery query) {
return ApiResult.success(warehousingService.inventoryReceiptList(query));
+ }
+ @ApiOperation(value = "镜片出入库单列表")
+ @PostMapping(value = "/inventoryReceiptLensList")
+ public ApiResult<PageInfo<TWarehousingLensVO>> inventoryReceiptLensList(@RequestBody TWarehousingDetailLensQuery query) {
+ return ApiResult.success(warehousingService.inventoryReceiptLensList(query));
}
/**
@@ -62,13 +80,22 @@
PageInfo<TFrameWarehousingDetailVO> frameWarehousingDetailVOPageInfo = warehousingService.detailList(query);
return ApiResult.success(frameWarehousingDetailVOPageInfo);
}
+ /**
+ * 库存明细记录列表
+ */
+ @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 = "/outBound")
- public ApiResult<String> outBound(@Validated @RequestBody TWarehousingDTO dto) {
+ public ApiResult<Integer> outBound(@Validated @RequestBody TWarehousingDTO dto) {
// 获取当前用户
String username = JwtTokenUtils.getUsername();
dto.setCreateBy(username);
@@ -83,6 +110,64 @@
detail.setCode(WarehousingConstant.OUT_BOUND+CodeGenerateUtils.generateVolumeSn());
});
frameWarehousingDetailService.saveBatch(frameWarehousingDetails);
+ if (dto.getStatus()==1||dto.getStatus()==3){
+ List<TFrameGoods> list1 = new ArrayList<>();
+ for (TFrameWarehousingDetail frameWarehousingDetail : frameWarehousingDetails) {
+ TFrameGoods one = frameGoodsService.lambdaQuery().eq(TFrameGoods::getModelId, frameWarehousingDetail.getModelId())
+ .eq(TFrameGoods::getColor, frameWarehousingDetail.getColor()).one();
+ if (one!=null){
+ // 增加对应库存
+ one.setTotal(one.getTotal()-frameWarehousingDetail.getTotal());
+ list1.add(one);
+ }
+ }
+ if (!list1.isEmpty())frameGoodsService.updateBatchById(list1);
+ }
+ if (dto.getStatus()==2 || dto.getStatus()==4){
+ List<TFrameGoods> list1 = new ArrayList<>();
+ List<TFrameGoods> list2 = new ArrayList<>();
+ for (TFrameWarehousingDetail frameWarehousingDetail : frameWarehousingDetails) {
+ TFrameGoods one = frameGoodsService.lambdaQuery().eq(TFrameGoods::getModelId, frameWarehousingDetail.getModelId())
+ .eq(TFrameGoods::getColor, frameWarehousingDetail.getColor()).one();
+ if (one!=null){
+ // 增加对应库存
+ one.setTotal(one.getTotal()+frameWarehousingDetail.getTotal());
+ list1.add(one);
+ }else {
+ // 新增
+ TFrameGoods tFrameGoods = new TFrameGoods();
+ tFrameGoods.setColor(frameWarehousingDetail.getColor());
+ tFrameGoods.setTotal(frameWarehousingDetail.getTotal());
+ tFrameGoods.setModelId(frameWarehousingDetail.getModelId());
+ tFrameGoods.setStoreId(dto.getStoreId());
+ list2.add(tFrameGoods);
+ }
+ }
+ if (!list1.isEmpty())frameGoodsService.updateBatchById(list1);
+ if (!list2.isEmpty())frameGoodsService.saveBatch(list2);
+ }
+
+ return ApiResult.success(dto.getId());
+ }
+ /**
+ * 添加镜片出库，入库，作废，退货
+ */
+ @ApiOperation(value = "添加镜片出库，入库，作废，退货")
+ @PostMapping(value = "/outBoundLens")
+ public ApiResult<String> outBoundLens(@Validated @RequestBody TWarehousingLensDTO dto) {
+ // 获取当前用户
+ String username = JwtTokenUtils.getUsername();
+ dto.setCreateBy(username);
+ dto.setCreateTime(LocalDateTime.now());
+ dto.setType(WarehousingTypeEnum.LENS.getCode());
+ warehousingService.save(dto);
+ // 添加明细
+ List<TLensWarehousingDetail> frameWarehousingDetails = dto.getLensWarehousingDetails();
+ frameWarehousingDetails.forEach(detail -> {
+ detail.setWarehousingId(dto.getId());
+ detail.setCode(WarehousingConstant.OUT_BOUND+CodeGenerateUtils.generateVolumeSn());
+ });
+ lensWarehousingDetailService.saveBatch(frameWarehousingDetails);
return ApiResult.success();
}
@@ -102,6 +187,19 @@
vo.setTotalNum(list.stream().mapToInt(TFrameWarehousingDetail::getTotal).sum());
return ApiResult.success(vo);
}
+ @ApiOperation(value = "镜片查询详情")
+ @GetMapping(value = "/getDetailLensById")
+ public ApiResult<TWarehousingLensVO> getDetailLensById(@RequestParam Integer id) {
+ TWarehousing warehousing = warehousingService.getById(id);
+ TWarehousingLensVO vo = new TWarehousingLensVO();
+ BeanUtils.copyProperties(warehousing, vo);
+ List<TLensWarehousingDetail> list = lensWarehousingDetailService.list(Wrappers.lambdaQuery(TLensWarehousingDetail.class)
+ .eq(TLensWarehousingDetail::getWarehousingId, id));
+ vo.setLensWarehousingDetails(list);
+ // 统计数量
+ vo.setTotalNum(list.stream().mapToInt(TLensWarehousingDetail::getTotal).sum());
+ return ApiResult.success(vo);
+ }
}
--
Gitblit v1.7.1