From a122cfc45d18b6e679029a88eb342e9081df6595 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 12 五月 2026 09:14:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_浪潮_pro
---
src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 deletions(-)
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 3808916..d053614 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
@@ -114,7 +114,7 @@
//鍑哄簱璋冪敤
@Override
@Transactional(rollbackFor = Exception.class)
- public Boolean subtractStockInventory(StockInventoryDto stockInventoryDto) {
+ public StockOutRecordDto subtractStockInventory(StockInventoryDto stockInventoryDto) {
LambdaQueryWrapper<StockInventory> eq = new QueryWrapper<StockInventory>().lambda()
.eq(StockInventory::getProductModelId, stockInventoryDto.getProductModelId());
if (StringUtils.isEmpty(stockInventoryDto.getBatchNo())) {
@@ -129,9 +129,11 @@
stockOutRecordDto.setRecordType(stockInventoryDto.getRecordType());
stockOutRecordDto.setStockOutNum(stockInventoryDto.getQualitity());
stockOutRecordDto.setBatchNo(stockInventoryDto.getBatchNo());
+ stockOutRecordDto.setApprovalStatus(0);
stockOutRecordDto.setProductModelId(stockInventoryDto.getProductModelId());
stockOutRecordDto.setType("0");
- stockOutRecordService.add(stockOutRecordDto);
+ Long id = stockOutRecordService.add(stockOutRecordDto);
+ stockInventoryDto.setId(id);
StockInventory oldStockInventory = stockInventoryMapper.selectOne(eq);
@@ -147,12 +149,12 @@
}
stockInventoryMapper.updateSubtractStockInventory(stockInventoryDto);
- return true;
+ return stockOutRecordDto;
}
@Override
@Transactional(rollbackFor = Exception.class)
- public Boolean addStockInRecordOnly(StockInventoryDto stockInventoryDto) {
+ public StockInRecordDto addStockInRecordOnly(StockInventoryDto stockInventoryDto) {
String batchNo = StringUtils.trim(stockInventoryDto.getBatchNo());
if (StringUtils.isEmpty(batchNo)) {
batchNo = generateAutoBatchNo(stockInventoryDto.getProductModelId());
@@ -164,11 +166,13 @@
stockInRecordDto.setRecordType(stockInventoryDto.getRecordType());
stockInRecordDto.setStockInNum(stockInventoryDto.getQualitity());
stockInRecordDto.setBatchNo(batchNo);
+ stockInRecordDto.setApprovalStatus(0);
stockInRecordDto.setProductModelId(stockInventoryDto.getProductModelId());
stockInRecordDto.setType("0");
stockInRecordDto.setRemark(stockInventoryDto.getRemark());
- stockInRecordService.add(stockInRecordDto);
- return true;
+ Long add = stockInRecordService.add(stockInRecordDto);
+ stockInRecordDto.setId( add);
+ return stockInRecordDto;
}
//瑙勫垯鐢熸垚锛�20260424-浜у搧缂栧彿-001
@@ -249,7 +253,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public Boolean addStockOutRecordOnly(StockInventoryDto stockInventoryDto) {
+ public StockOutRecordDto addStockOutRecordOnly(StockInventoryDto stockInventoryDto) {
LambdaQueryWrapper<StockInventory> eq = new LambdaQueryWrapper<>();
eq.eq(StockInventory::getProductModelId, stockInventoryDto.getProductModelId());
if (StringUtils.isEmpty(stockInventoryDto.getBatchNo())) {
@@ -285,8 +289,9 @@
stockOutRecordDto.setProductModelId(stockInventoryDto.getProductModelId());
stockOutRecordDto.setType("0");
stockOutRecordDto.setRemark(stockInventoryDto.getRemark());
- stockOutRecordService.add(stockOutRecordDto);
- return true;
+ Long add = stockOutRecordService.add(stockOutRecordDto);
+ stockInventoryDto.setId(add);
+ return stockOutRecordDto;
}
@Override
@@ -433,4 +438,19 @@
public List<StockInventory> getByModelId(Long modelId) {
return stockInventoryMapper.getByModelId(modelId);
}
+
+ @Override
+ public List<StockInventoryDto> selectStockInvenrory(Long productModelId) {
+ return stockInventoryMapper.selectStockInvenrory(productModelId);
+ }
+
+ @Override
+ public IPage<StockInventoryDto> pagestockInventoryNoQua(Page page, StockInventoryDto stockInventoryDto) {
+ return stockInventoryMapper.pagestockInventoryNoQua(page, stockInventoryDto);
+ }
+
+ @Override
+ public boolean updateLocked(Long productModelId, String batchNo, boolean b) {
+ return stockInventoryMapper.updateLocked(productModelId, batchNo, b) > 0;
+ }
}
--
Gitblit v1.9.3