From 18480213c000dfd7f6f236903f965a4d3f254597 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 09 六月 2026 17:23:46 +0800
Subject: [PATCH] 销售台账列表返回库存类型
---
src/main/java/com/ruoyi/stock/service/impl/StockUninventoryServiceImpl.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockUninventoryServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockUninventoryServiceImpl.java
index bf7f294..77abca7 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockUninventoryServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockUninventoryServiceImpl.java
@@ -13,6 +13,7 @@
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.stock.enums.StockInventorySourceEnum;
import com.ruoyi.stock.dto.StockInRecordDto;
import com.ruoyi.stock.dto.StockInventoryDto;
import com.ruoyi.stock.dto.StockOutRecordDto;
@@ -62,7 +63,30 @@
@Override
public IPage<StockUninventoryDto> pageWasteQuery(Page page, StockUninventoryDto stockUninventoryDto) {
- return stockUninventoryMapper.pageWasteQuery(page, stockUninventoryDto);
+ IPage<StockUninventoryDto> resultPage = stockUninventoryMapper.pageWasteQuery(page, stockUninventoryDto);
+ resultPage.getRecords().forEach(dto -> {
+ if (StringUtils.isNotEmpty(dto.getSource())) {
+ StockInventorySourceEnum sourceEnum = StockInventorySourceEnum.fromCode(dto.getSource());
+ if (sourceEnum != null) {
+ dto.setSourceText(sourceEnum.getValue());
+ }
+ }
+ });
+ return resultPage;
+ }
+
+ @Override
+ public IPage<StockUninventoryDto> getWasteBatchNoQty(Page page, StockInventoryDto stockInventoryDto) {
+ IPage<StockUninventoryDto> resultPage = stockUninventoryMapper.getWasteBatchNoQty(page, stockInventoryDto);
+ resultPage.getRecords().forEach(dto -> {
+ if (StringUtils.isNotEmpty(dto.getSource())) {
+ StockInventorySourceEnum unQualifiedSourceEnum = StockInventorySourceEnum.fromCode(dto.getSource());
+ if (unQualifiedSourceEnum != null) {
+ dto.setSourceText(unQualifiedSourceEnum.getValue());
+ }
+ }
+ });
+ return resultPage;
}
@Override
@@ -127,7 +151,8 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Integer addStockInRecordOnly(StockUninventoryDto stockUninventoryDto) {
- stockUninventoryDto.setType(resolveInventoryType(stockUninventoryDto));
+ String inventoryType = resolveInventoryType(stockUninventoryDto);
+ stockUninventoryDto.setType(inventoryType);
StockInRecordDto stockInRecordDto = new StockInRecordDto();
stockInRecordDto.setRecordId(stockUninventoryDto.getRecordId());
stockInRecordDto.setRecordType(stockUninventoryDto.getRecordType());
@@ -138,7 +163,11 @@
}
stockInRecordDto.setBatchNo(batchNo);
stockInRecordDto.setProductModelId(stockUninventoryDto.getProductModelId());
- stockInRecordDto.setType("1");
+ if (UNQUALIFIED_TYPE.equals(inventoryType)) {
+ stockInRecordDto.setType("1");
+ } else {
+ stockInRecordDto.setType("2");
+ }
stockInRecordDto.setRemark(stockUninventoryDto.getRemark());
stockInRecordService.add(stockInRecordDto);
return 1;
@@ -192,6 +221,14 @@
@Override
public void exportStockUninventory(HttpServletResponse response, StockUninventoryDto stockUninventoryDto) {
List<StockUnInventoryExportData> list = stockUninventoryMapper.listStockInventoryExportData(stockUninventoryDto);
+ list.forEach(item -> {
+ if (StringUtils.isNotEmpty(item.getSource())) {
+ StockInventorySourceEnum sourceEnum = StockInventorySourceEnum.fromCode(item.getSource());
+ if (sourceEnum != null) {
+ item.setSourceText(sourceEnum.getValue());
+ }
+ }
+ });
ExcelUtil<StockUnInventoryExportData> util = new ExcelUtil<>(StockUnInventoryExportData.class);
util.exportExcel(response,list, "涓嶅悎鏍煎簱瀛樹俊鎭�");
}
@@ -199,6 +236,14 @@
@Override
public void exportWasteQuery(HttpServletResponse response, StockUninventoryDto stockUninventoryDto) {
List<StockUnInventoryExportData> list = stockUninventoryMapper.listWasteQueryExportData(stockUninventoryDto);
+ list.forEach(item -> {
+ if (StringUtils.isNotEmpty(item.getSource())) {
+ StockInventorySourceEnum sourceEnum = StockInventorySourceEnum.fromCode(item.getSource());
+ if (sourceEnum != null) {
+ item.setSourceText(sourceEnum.getValue());
+ }
+ }
+ });
ExcelUtil<StockUnInventoryExportData> util = new ExcelUtil<>(StockUnInventoryExportData.class);
util.exportExcel(response, list, "搴熷搧鏌ヨ淇℃伅");
}
--
Gitblit v1.9.3