From 5419a78b26e0005d65d53ad77ab437e6b5e6f712 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 11 五月 2026 15:36:27 +0800
Subject: [PATCH] feat(log): 添加日志报告备注字段并完善库存管理功能
---
src/main/java/com/ruoyi/stock/service/impl/StockInventoryCheckPlanServiceImpl.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryCheckPlanServiceImpl.java b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryCheckPlanServiceImpl.java
index 698c0a8..4b6bfa0 100644
--- a/src/main/java/com/ruoyi/stock/service/impl/StockInventoryCheckPlanServiceImpl.java
+++ b/src/main/java/com/ruoyi/stock/service/impl/StockInventoryCheckPlanServiceImpl.java
@@ -119,6 +119,8 @@
return R.fail("鐩樼偣鍗曚笉瀛樺湪");
}
for (StockInventoryCheckItem item : stockInventoryCheckPlanDto.getCheckItems()) {
+ //鏇存柊搴撳瓨閿佸畾鐘舵��
+ stockInventoryService.updateLocked(item.getProductModelId(),item.getBatchNo(), false);
if (item.getDifferenceQuantity() == null || item.getDifferenceQuantity().compareTo(BigDecimal.ZERO) == 0) {
continue;
}
@@ -129,16 +131,15 @@
stockInventoryDto.setRecordId(stockInventoryCheckPlanDto.getId());
if (item.getDifferenceQuantity().compareTo(BigDecimal.ZERO) > 0) {
- stockInventoryDto.setRecordType(StockInQualifiedRecordTypeEnum.INVENTORY_CHECK_STOCK_OUT.getCode());
- StockInRecordDto stockInRecordDto = stockUtils.addStockWithBatchNo(stockInventoryDto.getProductModelId(), stockInventoryDto.getQualitity(), stockInventoryDto.getRecordType(), stockInventoryDto.getRecordId(), stockInventoryDto.getBatchNo());
+ stockInventoryDto.setRecordType(StockInQualifiedRecordTypeEnum.INVENTORY_CHECK_STOCK_IN.getCode());
+ StockInRecordDto stockInRecordDto = stockUtils.addStockWithBatchNo(stockInventoryDto.getProductModelId(), item.getDifferenceQuantity().abs (), stockInventoryDto.getRecordType(), stockInventoryDto.getRecordId(), stockInventoryDto.getBatchNo());
//鐩存帴瀹℃牳閫氳繃
stockInRecordService.batchApprove(Collections.singletonList(stockInRecordDto.getId()), 1);
}else {
- stockInventoryDto.setRecordType(StockInQualifiedRecordTypeEnum.INVENTORY_CHECK_STOCK_IN.getCode());
- StockOutRecordDto stockOutRecordDto = stockUtils.substractStock(stockInventoryDto.getProductModelId(), stockInventoryDto.getQualitity(), stockInventoryDto.getRecordType(), stockInventoryDto.getRecordId(), stockInventoryDto.getBatchNo());
+ stockInventoryDto.setRecordType(StockInQualifiedRecordTypeEnum.INVENTORY_CHECK_STOCK_OUT.getCode());
+ StockOutRecordDto stock = stockUtils.substractStock(stockInventoryDto.getProductModelId(), item.getDifferenceQuantity().abs(), stockInventoryDto.getRecordType(), stockInventoryDto.getRecordId(), stockInventoryDto.getBatchNo());
//鐩存帴瀹℃牳閫氳繃
- stockOutRecordService.batchApprove(Collections.singletonList(stockOutRecordDto.getId()), 1);
-
+ stockOutRecordService.batchApprove(Collections.singletonList(stock.getId()), 1);
}
}
stockInventoryCheckItemMapper.updateById(stockInventoryCheckPlanDto.getCheckItems());
--
Gitblit v1.9.3