From 4336d99906953517399187638925817d969c4e10 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 14 五月 2026 14:18:14 +0800
Subject: [PATCH] refactor(stock): 优化库存管理和产品模型查询功能
---
src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java | 49 +++++++++++++++++++++++++++++++------------------
1 files changed, 31 insertions(+), 18 deletions(-)
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 dc15843..a22733e 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
@@ -78,13 +78,11 @@
for (Long id : ids) {
StockInRecord stockInRecord = stockInRecordMapper.selectById(id);
if (stockInRecord.getType().equals("0")) {
- LambdaQueryWrapper<StockInventory> eq = new LambdaQueryWrapper<StockInventory>()
- .eq(StockInventory::getProductModelId, stockInRecord.getProductModelId());
- if (StringUtils.isEmpty(stockInRecord.getBatchNo())) {
- eq.isNull(StockInventory::getBatchNo);
- } else {
- eq.eq(StockInventory::getBatchNo, stockInRecord.getBatchNo());
- }
+ LambdaQueryWrapper<StockInventory> eq = buildQualifiedInventoryQuery(
+ stockInRecord.getProductModelId(),
+ stockInRecord.getBatchNo(),
+ stockInRecord.getWarehouseInfoId()
+ );
StockInventory stockInventory = stockInventoryMapper.selectOne(eq);
if (stockInventory == null) {
throw new BaseException("搴撳瓨璁板綍涓病鏈夊搴旂殑浜у搧,鏃犳硶鍒犻櫎!!!");
@@ -92,6 +90,7 @@
StockInventoryDto stockInRecordDto = new StockInventoryDto();
stockInRecordDto.setProductModelId(stockInventory.getProductModelId());
stockInRecordDto.setBatchNo(stockInventory.getBatchNo());
+ stockInRecordDto.setWarehouseInfoId(stockInventory.getWarehouseInfoId());
stockInRecordDto.setQualitity(stockInRecord.getStockInNum());
stockInventoryMapper.updateSubtractStockInventory(stockInRecordDto);
}
@@ -132,15 +131,8 @@
util.exportExcel(response,list, "鍏ュ簱璁板綍淇℃伅");
}
- 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) {
@@ -171,7 +163,7 @@
@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("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
@@ -187,12 +179,17 @@
throw new BaseException("鍙湁寰呭鎵圭姸鎬佺殑璁板綍鎵嶈兘瀹℃壒,鍏ュ簱鎵规:" + stockInRecord.getInboundBatches());
}
stockInRecord.setApprovalStatus(approvalStatus);
+ stockInRecord.setWarehouseInfoId(warehouseInfoId);
stockInRecordMapper.updateById(stockInRecord);
// 瀹℃壒閫氳繃鏃讹紝搴撳瓨澧炲姞
if (ReviewStatusEnum.APPROVED.getCode().equals(approvalStatus)) {
if ("0".equals(stockInRecord.getType())) {
// 鍚堟牸鍏ュ簱 -> 鍏堟煡搴撳瓨锛屽瓨鍦ㄥ垯鏇存柊锛屼笉瀛樺湪鍒欐柊澧�
- StockInventory stockInventory = getStockInventory(stockInRecord.getProductModelId(), stockInRecord.getBatchNo());
+ StockInventory stockInventory = getStockInventory(
+ stockInRecord.getProductModelId(),
+ stockInRecord.getBatchNo(),
+ warehouseInfoId
+ );
if (!ObjectUtils.isEmpty(stockInventory)) {
if (stockInventory.getLocked().equals( true)&&!stockInRecord.getRecordType().equals(StockInQualifiedRecordTypeEnum.INVENTORY_CHECK_STOCK_IN.getCode())) {
throw new BaseException("姝ｅ湪搴撳瓨鐩樼偣,鏃犳硶鍏ュ簱,鍏ュ簱鎵规:" + stockInRecord.getInboundBatches());
@@ -201,6 +198,7 @@
StockInventoryDto stockInventoryDto = new StockInventoryDto();
stockInventoryDto.setProductModelId(stockInRecord.getProductModelId());
stockInventoryDto.setBatchNo(stockInRecord.getBatchNo());
+ stockInventoryDto.setWarehouseInfoId(warehouseInfoId);
stockInventoryDto.setQualitity(stockInRecord.getStockInNum());
stockInventoryDto.setRemark(stockInRecord.getRemark());
if (stockInventory == null) {
@@ -209,6 +207,7 @@
setQualitity(stockInRecord.getStockInNum());
setBatchNo(stockInRecord.getBatchNo());
setRemark(stockInRecord.getRemark());
+ setWarehouseInfoId(warehouseInfoId);
setVersion(1);
}});
} else {
@@ -238,4 +237,18 @@
}
return ids.size();
}
+
+ private LambdaQueryWrapper<StockInventory> buildQualifiedInventoryQuery(Long productModelId, String batchNo, Long warehouseInfoId) {
+ LambdaQueryWrapper<StockInventory> wrapper = new LambdaQueryWrapper<StockInventory>()
+ .eq(StockInventory::getProductModelId, productModelId);
+ if (warehouseInfoId != null) {
+ 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