From 76c84d95506998f546e6f3ebbf70414c0dd9da9d Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 15 五月 2026 17:15:15 +0800
Subject: [PATCH] refactor(stock): 优化库存记录服务中的仓库信息处理逻辑
---
src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java | 59 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 38 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java
index 9a6bd9b..a0a437f 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java
@@ -53,13 +53,14 @@
}
@Override
- public int add(StockOutRecordDto stockOutRecordDto) {
+ public Long add(StockOutRecordDto stockOutRecordDto) {
String no = OrderUtils.countTodayByCreateTime(stockOutRecordMapper, "CK","outbound_batches");
stockOutRecordDto.setOutboundBatches(no);
if (StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode().equals(stockOutRecordDto.getRecordType())){
stockOutRecordDto.setApprovalStatus(3);
}
- return stockOutRecordMapper.insert(stockOutRecordDto);
+ stockOutRecordMapper.insert(stockOutRecordDto);
+ return stockOutRecordDto.getId();
}
@Override
@@ -80,13 +81,11 @@
for (Long id : ids) {
StockOutRecord stockOutRecord = stockOutRecordMapper.selectById(id);
if (stockOutRecord.getType().equals("0")) {
- LambdaQueryWrapper<StockInventory> wrapper = new LambdaQueryWrapper<StockInventory>()
- .eq(StockInventory::getProductModelId, stockOutRecord.getProductModelId());
- if (StringUtils.isEmpty(stockOutRecord.getBatchNo())) {
- wrapper.isNull(StockInventory::getBatchNo);
- } else {
- wrapper.eq(StockInventory::getBatchNo, stockOutRecord.getBatchNo());
- }
+ LambdaQueryWrapper<StockInventory> wrapper = buildQualifiedInventoryQuery(
+ stockOutRecord.getProductModelId(),
+ stockOutRecord.getBatchNo(),
+ stockOutRecord.getWarehouseInfoId()
+ );
StockInventory stockInventory = stockInventoryMapper.selectOne(wrapper);
if (stockInventory == null) {
throw new BaseException("搴撳瓨璁板綍涓病鏈夊搴旂殑浜у搧,鏃犳硶鍒犻櫎!!!");
@@ -95,6 +94,7 @@
stockInRecordDto.setProductModelId(stockInventory.getProductModelId());
stockInRecordDto.setQualitity(stockOutRecord.getStockOutNum());
stockInRecordDto.setBatchNo(stockInventory.getBatchNo());
+ stockInRecordDto.setWarehouseInfoId(stockInventory.getWarehouseInfoId());
stockInventoryMapper.updateAddStockInventory(stockInRecordDto);
}
}else if (stockOutRecord.getType().equals("1")) {
@@ -146,12 +146,12 @@
throw new BaseException("鍙湁寰呭鎵圭姸鎬佺殑璁板綍鎵嶈兘鍒犻櫎,鍑哄簱鎵规:" + stockOutRecord.getOutboundBatches());
}
}
- return stockOutRecordMapper.deleteBatchIds(ids);
+ return stockOutRecordMapper.deleteByIds(ids);
}
@Override
@Transactional(rollbackFor = Exception.class)
- public int batchApprove(List<Long> ids, Integer approvalStatus) {
+ public int batchApprove(List<Long> ids, Integer approvalStatus,Long warehouseInfoId) {
if (CollectionUtils.isEmpty(ids)) {
throw new BaseException("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
@@ -172,13 +172,21 @@
if (ReviewStatusEnum.APPROVED.getCode().equals(approvalStatus)) {
if ("0".equals(stockOutRecord.getType())) {
// 鍚堟牸鍑哄簱 -> 鍏堟煡搴撳瓨鏄惁瀛樺湪锛屽瓨鍦ㄦ墠鎵ｅ噺
- StockInventory stockInventory = getStockInventory(stockOutRecord.getProductModelId(), stockOutRecord.getBatchNo());
+ StockInventory stockInventory = getStockInventory(
+ stockOutRecord.getProductModelId(),
+ stockOutRecord.getBatchNo(),
+ stockOutRecord.getWarehouseInfoId()
+ );
if (stockInventory == null) {
throw new BaseException("鍚堟牸搴撳瓨璁板綍涓嶅瓨鍦�,鍑哄簱鎵规:" + stockOutRecord.getOutboundBatches());
+ }
+ if (stockInventory.getLocked().equals( true)&&!stockOutRecord.getRecordType().equals(StockOutQualifiedRecordTypeEnum.INVENTORY_CHECK_STOCK_OUT.getCode())) {
+ throw new BaseException("姝ｅ湪搴撳瓨鐩樼偣,鏃犳硶鍑哄簱,鍑哄簱鎵规:" + stockOutRecord.getOutboundBatches());
}
StockInventoryDto stockInventoryDto = new StockInventoryDto();
stockInventoryDto.setProductModelId(stockOutRecord.getProductModelId());
stockInventoryDto.setBatchNo(stockOutRecord.getBatchNo());
+ stockInventoryDto.setWarehouseInfoId(stockOutRecord.getWarehouseInfoId());
stockInventoryDto.setQualitity(stockOutRecord.getStockOutNum());
stockInventoryMapper.updateSubtractStockInventory(stockInventoryDto);
} else if ("1".equals(stockOutRecord.getType())) {
@@ -198,15 +206,8 @@
return ids.size();
}
- private StockInventory getStockInventory(Long productModelId, String batchNo) {
- LambdaQueryWrapper<StockInventory> eq = new LambdaQueryWrapper<>();
- eq.eq(StockInventory::getProductModelId, productModelId);
- if (StringUtils.isEmpty(batchNo)) {
- eq.isNull(StockInventory::getBatchNo);
- } else {
- eq.eq(StockInventory::getBatchNo, batchNo);
- }
- return stockInventoryMapper.selectOne(eq);
+ private StockInventory getStockInventory(Long productModelId, String batchNo, Long warehouseInfoId) {
+ return stockInventoryMapper.selectOne(buildQualifiedInventoryQuery(productModelId, batchNo, warehouseInfoId));
}
private StockUninventory getStockUninventory(Long productModelId, String batchNo) {
@@ -219,4 +220,20 @@
}
return stockUninventoryMapper.selectOne(eq);
}
+
+ private LambdaQueryWrapper<StockInventory> buildQualifiedInventoryQuery(Long productModelId, String batchNo, Long warehouseInfoId) {
+ LambdaQueryWrapper<StockInventory> wrapper = new LambdaQueryWrapper<StockInventory>()
+ .eq(StockInventory::getProductModelId, productModelId);
+ if (warehouseInfoId == null) {
+ wrapper.isNull(StockInventory::getWarehouseInfoId);
+ } else {
+ wrapper.eq(StockInventory::getWarehouseInfoId, warehouseInfoId);
+ }
+ if (StringUtils.isEmpty(batchNo)) {
+ wrapper.isNull(StockInventory::getBatchNo);
+ } else {
+ wrapper.eq(StockInventory::getBatchNo, batchNo);
+ }
+ return wrapper;
+ }
}
--
Gitblit v1.9.3