From 7706e5b97ebbdd767a237d5a79d18da6e1269a1d Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 23 一月 2026 16:13:31 +0800
Subject: [PATCH] feat(stock): 添加库存出入库记录导出功能
---
src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java | 48 +++++++++++++++++++++++++-----------------------
1 files changed, 25 insertions(+), 23 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 7b3ee2c..35e2f13 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
@@ -8,7 +8,6 @@
import com.ruoyi.common.enums.StockQualifiedRecordTypeEnum;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.domain.R;
-import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.stock.dto.StockInRecordDto;
@@ -45,7 +44,6 @@
private StockInRecordService stockInRecordService;
private StockOutRecordService stockOutRecordService;
private SalesLedgerProductMapper salesLedgerProductMapper;
- private StockUtils stockUtils;
@Override
public IPage<StockInventoryDto> pagestockInventory(Page page, StockInventoryDto stockInventoryDto) {
return stockInventoryMapper.pagestockInventory(page, stockInventoryDto);
@@ -102,27 +100,31 @@
@Override
public R importStockInventory(MultipartFile file) {
-// try {
-// final StringBuffer[] errorMsg = {new StringBuffer()};
-// //鏌ヨ鎵�鏈夌殑浜у搧
-// List<SalesLedgerProduct> salesLedgerProducts =salesLedgerProductMapper.selectProduct();
-//
-// ExcelUtil<StockInventoryExportData> util = new ExcelUtil<StockInventoryExportData>(StockInventoryExportData.class);
-// List<StockInventoryExportData> list = util.importExcel(file.getInputStream());
-// list.stream().forEach(dto -> {
-// salesLedgerProducts.stream().forEach(item->{
-// if (item.getProductCategory().equals(dto.getProductName())&&item.getSpecificationModel().equals(dto.getModel())) {
-// //鏇存柊搴撳瓨
-// stockUtils.addStock(item.getId(),dto.getQualitity(), StockQualifiedRecordTypeEnum.CUSTOMIZATION_STOCK_IN.getCode(),0L);
-// }else {
-// errorMsg[0] = errorMsg[0].append("浜у搧鍚嶇О锛�"+dto.getProductName()+"瑙勬牸锛�"+dto.getModel()+"涓嶅瓨鍦�").append("\n");
-// }
-// });
-// });
-// return R.ok(errorMsg[0]);
-// }catch (Exception e){
-// e.printStackTrace();
-// }
+ try {
+ final StringBuffer[] errorMsg = {new StringBuffer()};
+ //鏌ヨ鎵�鏈夌殑浜у搧
+ List<SalesLedgerProduct> salesLedgerProducts =salesLedgerProductMapper.selectProduct();
+
+ ExcelUtil<StockInventoryExportData> util = new ExcelUtil<StockInventoryExportData>(StockInventoryExportData.class);
+ List<StockInventoryExportData> list = util.importExcel(file.getInputStream());
+ list.stream().forEach(dto -> {
+ salesLedgerProducts.stream().forEach(item->{
+ if (item.getProductCategory().equals(dto.getProductName())&&item.getSpecificationModel().equals(dto.getModel())) {
+ //鏇存柊搴撳瓨
+ StockInventoryDto stockInventoryDto = new StockInventoryDto();
+ stockInventoryDto.setRecordId(0L);
+ stockInventoryDto.setRecordType(StockQualifiedRecordTypeEnum.CUSTOMIZATION_STOCK_IN.getCode());
+ stockInventoryDto.setQualitity(dto.getQualitity());
+ stockInventoryDto.setProductModelId(item.getProductModelId());
+ this.addstockInventory(stockInventoryDto); }else {
+ errorMsg[0] = errorMsg[0].append("浜у搧鍚嶇О锛�"+dto.getProductName()+"瑙勬牸锛�"+dto.getModel()+"涓嶅瓨鍦�").append("\n");
+ }
+ });
+ });
+ return R.ok(errorMsg[0]);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
return R.fail();
}
--
Gitblit v1.9.3