From 520a715610bd67a6401e989ada8b1c43a312163b Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 11 九月 2026 08:09:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁
---
src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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 de5727b..62f0f51 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
@@ -251,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())) {
@@ -287,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
@@ -391,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, "搴撳瓨淇℃伅");
@@ -400,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
@@ -432,7 +438,7 @@
}
@Override
- public List<StockInventory> getByModelId(Long modelId) {
+ public List<StockInventoryDto> getByModelId(Long modelId) {
return stockInventoryMapper.getByModelId(modelId);
}
--
Gitblit v1.9.3