From 174c4a75e9dac46cf42399646bf49283583a43f5 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 09 六月 2026 14:38:01 +0800
Subject: [PATCH] 增加废品库存列表和导出接口，以及修改发货逻辑
---
src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 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 26f0c2d..e01d9d3 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java
@@ -47,6 +47,9 @@
@Service
@RequiredArgsConstructor
public class StockOutRecordServiceImpl extends ServiceImpl<StockOutRecordMapper, StockOutRecord> implements StockOutRecordService {
+ private static final String UNQUALIFIED_TYPE = "unqualified";
+ private static final String WASTE_TYPE = "waste";
+
private final StockOutRecordMapper stockOutRecordMapper;
private final StockInventoryMapper stockInventoryMapper;
private final StockUninventoryMapper stockUninventoryMapper;
@@ -110,8 +113,10 @@
}
}
else if (stockOutRecord.getType().equals("1")) {
+ String uninventoryType = resolveUninventoryTypeByOutRecordType(stockOutRecord.getRecordType());
LambdaQueryWrapper<StockUninventory> wrapper = new LambdaQueryWrapper<StockUninventory>()
- .eq(StockUninventory::getProductModelId, stockOutRecord.getProductModelId());
+ .eq(StockUninventory::getProductModelId, stockOutRecord.getProductModelId())
+ .eq(StockUninventory::getType, uninventoryType);
if (StringUtils.isEmpty(stockOutRecord.getBatchNo())) {
wrapper.isNull(StockUninventory::getBatchNo);
} else {
@@ -125,6 +130,7 @@
stockUninventoryDto.setProductModelId(stockUninventory.getProductModelId());
stockUninventoryDto.setQualitity(stockOutRecord.getStockOutNum());
stockUninventoryDto.setBatchNo(stockUninventory.getBatchNo());
+ stockUninventoryDto.setType(uninventoryType);
stockUninventoryMapper.updateAddStockUnInventory(stockUninventoryDto);
}
}
@@ -195,7 +201,8 @@
stockInventoryMapper.updateSubtractStockInventory(stockInventoryDto);
} else if ("1".equals(stockOutRecord.getType())) {
// 涓嶅悎鏍煎嚭搴� -> 鍏堟煡搴撳瓨鏄惁瀛樺湪锛屽瓨鍦ㄦ墠鎵ｅ噺
- StockUninventory stockUninventory = getStockUninventory(stockOutRecord.getProductModelId(), stockOutRecord.getBatchNo());
+ String uninventoryType = resolveUninventoryTypeByOutRecordType(stockOutRecord.getRecordType());
+ StockUninventory stockUninventory = getStockUninventory(stockOutRecord.getProductModelId(), stockOutRecord.getBatchNo(), uninventoryType);
if (stockUninventory == null) {
throw new BaseException("涓嶅悎鏍煎簱瀛樿褰曚笉瀛樺湪,鍑哄簱鎵规:" + stockOutRecord.getOutboundBatches());
}
@@ -203,6 +210,7 @@
stockUninventoryDto.setProductModelId(stockOutRecord.getProductModelId());
stockUninventoryDto.setBatchNo(stockOutRecord.getBatchNo());
stockUninventoryDto.setQualitity(stockOutRecord.getStockOutNum());
+ stockUninventoryDto.setType(uninventoryType);
stockUninventoryMapper.updateSubtractStockUnInventory(stockUninventoryDto);
}
}
@@ -221,9 +229,12 @@
return stockInventoryMapper.selectOne(eq);
}
- private StockUninventory getStockUninventory(Long productModelId, String batchNo) {
+ private StockUninventory getStockUninventory(Long productModelId, String batchNo, String uninventoryType) {
LambdaQueryWrapper<StockUninventory> eq = new LambdaQueryWrapper<>();
eq.eq(StockUninventory::getProductModelId, productModelId);
+ if (StringUtils.isNotEmpty(uninventoryType)) {
+ eq.eq(StockUninventory::getType, uninventoryType);
+ }
if (StringUtils.isEmpty(batchNo)) {
eq.isNull(StockUninventory::getBatchNo);
} else {
@@ -231,4 +242,11 @@
}
return stockUninventoryMapper.selectOne(eq);
}
+
+ private String resolveUninventoryTypeByOutRecordType(String recordType) {
+ if (StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode().equals(recordType)) {
+ return WASTE_TYPE;
+ }
+ return UNQUALIFIED_TYPE;
+ }
}
--
Gitblit v1.9.3