From 00b31db4f3677dc919a1c4e1c227fd8fdd65f60f Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 11 六月 2026 19:30:35 +0800
Subject: [PATCH] fix: 修复采购库存自动提交同一个入库单，多个同一规格入库报错
---
src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java | 5 -----
src/main/java/com/ruoyi/stock/service/StockInRecordService.java | 2 +-
src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java | 5 +++--
src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java | 6 +-----
4 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java b/src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java
index f6c8d64..15fea11 100644
--- a/src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java
+++ b/src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java
@@ -114,11 +114,6 @@
stockInventoryDto.setProductModelId(productModelId);
stockInventoryDto.setBatchNo(batchNo);
stockInventoryService.addStockInRecordOnly(stockInventoryDto);
- //StockInRecord stockInRecord = stockInRecordService.getOne(Wrappers.<StockInRecord>lambdaQuery()
- // .eq(StockInRecord::getRecordId, stockInventoryDto.getRecordId())
- // .eq(StockInRecord::getRecordType, stockInventoryDto.getRecordType())
- //);
- //stockInRecordService.batchApprove(Collections.singletonList(stockInRecord.getId()),1);
}
/**
diff --git a/src/main/java/com/ruoyi/stock/service/StockInRecordService.java b/src/main/java/com/ruoyi/stock/service/StockInRecordService.java
index 117b70f..dc7a600 100644
--- a/src/main/java/com/ruoyi/stock/service/StockInRecordService.java
+++ b/src/main/java/com/ruoyi/stock/service/StockInRecordService.java
@@ -12,7 +12,7 @@
public interface StockInRecordService extends IService<StockInRecord> {
IPage<StockInRecordDto> listPage(Page page, StockInRecordDto stockInRecordDto);
- int add(StockInRecordDto stockInRecordDto);
+ StockInRecord add(StockInRecordDto stockInRecordDto);
int update(Long id, StockInRecordDto stockInRecordDto);
diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
index aefa0bb..5fbc6b3 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
@@ -52,12 +52,13 @@
// 鏂板鍏ュ簱
@Override
@Transactional(rollbackFor = Exception.class)
- public int add(StockInRecordDto stockInRecordDto) {
+ public StockInRecord add(StockInRecordDto stockInRecordDto) {
String no = OrderUtils.countTodayByCreateTime(stockInRecordMapper, "RK","inbound_batches");
stockInRecordDto.setInboundBatches(no);
StockInRecord stockInRecord = new StockInRecord();
BeanUtils.copyProperties(stockInRecordDto, stockInRecord);
- return stockInRecordMapper.insert(stockInRecord);
+ stockInRecordMapper.insert(stockInRecord);
+ return stockInRecord;
}
@Override
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..de5727b 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;
--
Gitblit v1.9.3