From a27fdf6b900e267eb84e1c6a5e1a693ee90d1274 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 10 九月 2026 21:17:05 +0800
Subject: [PATCH] feat(stock): 添加库存报表导出功能并完善库存入库字段Excel注解
---
src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
index ae98434..62f0f51 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
@@ -166,12 +166,8 @@
stockInRecordDto.setWarnNum(stockInventoryDto.getWarnNum());
stockInRecordDto.setType("0");
stockInRecordDto.setRemark(stockInventoryDto.getRemark());
- stockInRecordService.add(stockInRecordDto);
+ StockInRecord stockInRecord = stockInRecordService.add(stockInRecordDto);
- StockInRecord stockInRecord = stockInRecordService.getOne(Wrappers.<StockInRecord>lambdaQuery()
- .eq(StockInRecord::getRecordId, stockInRecordDto.getRecordId())
- .eq(StockInRecord::getRecordType, stockInRecordDto.getRecordType())
- );
stockInRecordService.batchApprove(Collections.singletonList(stockInRecord.getId()),1);
return true;
@@ -255,7 +251,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public Boolean addStockOutRecordOnly(StockInventoryDto stockInventoryDto) {
+ public StockOutRecordDto addStockOutRecordOnly(StockInventoryDto stockInventoryDto) {
LambdaQueryWrapper<StockInventory> eq = new LambdaQueryWrapper<>();
eq.eq(StockInventory::getProductModelId, stockInventoryDto.getProductModelId());
if (StringUtils.isEmpty(stockInventoryDto.getBatchNo())) {
@@ -291,8 +287,8 @@
stockOutRecordDto.setProductModelId(stockInventoryDto.getProductModelId());
stockOutRecordDto.setType("0");
stockOutRecordDto.setRemark(stockInventoryDto.getRemark());
- stockOutRecordService.add(stockOutRecordDto);
- return true;
+ StockOutRecordDto add = stockOutRecordService.add(stockOutRecordDto);
+ return add;
}
@Override
@@ -395,7 +391,6 @@
@Override
public void exportStockInventory(HttpServletResponse response, StockInventoryDto stockInventoryDto) {
-
List<StockInventoryExportData> list = stockInventoryMapper.listStockInventoryExportData(stockInventoryDto);
ExcelUtil<StockInventoryExportData> util = new ExcelUtil<>(StockInventoryExportData.class);
util.exportExcel(response, list, "搴撳瓨淇℃伅");
@@ -404,6 +399,13 @@
@Override
public IPage<StockInRecordDto> stockInventoryPage(StockInventoryDto stockInventoryDto, Page page) {
return stockInventoryMapper.stockInventoryPage(stockInventoryDto, page);
+ }
+
+ @Override
+ public void exportStockInventoryPage(HttpServletResponse response, StockInventoryDto stockInventoryDto) {
+ List<StockInRecordDto> list = stockInventoryMapper.stockInventoryPage(stockInventoryDto,new Page(-1,-1)).getRecords();
+ ExcelUtil<StockInRecordDto> util = new ExcelUtil<>(StockInRecordDto.class);
+ util.exportExcel(response, list, "搴撳瓨鎶ヨ〃瀵煎嚭");
}
@Override
@@ -436,7 +438,7 @@
}
@Override
- public List<StockInventory> getByModelId(Long modelId) {
+ public List<StockInventoryDto> getByModelId(Long modelId) {
return stockInventoryMapper.getByModelId(modelId);
}
--
Gitblit v1.9.3