From a76e1d17d67641993dea6335cb8e1465a94df58d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 21 五月 2026 15:39:05 +0800
Subject: [PATCH] feat(stock): 优化库存管理和成品树结构功能 1- 为ApproveProcessMapper.xml和ProductBomMapper.xml添加排序功能 2- 在ProductionProductMainDto中新增bomInputQty字段用于产品结构投入数量 3- 修改ProductionProductMainServiceImpl中投入数量计算逻辑，使用前端传入的bomInputQty值 4- 在ProductWorkOrderDto中添加bomInputQty字段并在服务实现中计算标准投入数量 5- 更新SalesLedgerMapper.xml查询逻辑，从product_summary获取电压信息 6- 为SalesLedgerProduct添加stockId字段并修改库存扣减逻辑使用具体库存ID 7- 重构StockInventoryController中的成品库存树查询接口和导入导出功能 8- 新增成品和非成品库存导入导出的数据模型和Excel工具类 9- 优化StockInventoryServiceImpl中的库存扣减逻辑，支持按特定库存ID操作 10- 更新库存导入导出功能，区分成品和非成品类型并提供相应模板
---
src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java | 54 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 35 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
index 9e70dfd..0ade630 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
@@ -95,7 +95,6 @@
private StockInventoryService stockInventoryService;
-
public ApproveProcess getApproveById(String id) {
LambdaQueryWrapper<ApproveProcess> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ApproveProcess::getApproveId, id);
@@ -107,7 +106,7 @@
}
@Override
- public void initApproveNodes(String approveUserIds, String approveID, Long tenantId) {
+ public void initApproveNodes(String approveUserIds, String approveID, Long tenantId, Long approveProcessId) {
Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
String[] names = approveUserIds.split(",");
for (int i = 0; i < names.length; i++) {
@@ -126,6 +125,9 @@
approveNode.setUpdateUser(userId);
approveNode.setCreateTime(LocalDateTime.now());
approveNode.setUpdateTime(LocalDateTime.now());
+ if (approveProcessId != null) {
+ approveNode.setProcessId(approveProcessId);
+ }
approveNodeMapper.insert(approveNode);
}
}
@@ -217,7 +219,7 @@
purchaseLedgerServiceImpl.addQualityInspect(purchaseLedger, salesLedgerProduct);
} else {
//鐩存帴鍏ュ簱
- stockUtils.addStock(salesLedgerProduct.getProductModelId(), salesLedgerProduct.getQuantity(), StockInQualifiedRecordTypeEnum.PURCHASE_STOCK_IN.getCode(), purchaseLedger.getId());
+ stockUtils.addStockNoReview(salesLedgerProduct.getProductModelId(), salesLedgerProduct.getQuantity(), StockInQualifiedRecordTypeEnum.PURCHASE_STOCK_IN.getCode(), purchaseLedger.getId());
}
}
} else if (status.equals(3)) {
@@ -264,6 +266,14 @@
}
}
+ // 鍏ュ簱瀹℃牳
+ if (approveProcess.getApproveType().equals(9)) {
+ StockInRecord stockInRecord = stockInRecordService.getById(approveNode.getRecordId());
+ if (!approveNode.isInventoryReview()) {
+ stockInRecord.setApproveStatus(3);
+ stockInRecordService.updateById(stockInRecord);
+ }
+ }
// 缁戝畾闄勪欢
if (!CollectionUtils.isEmpty(approveNode.getTempFileIds()) && approveNode.getApproveNodeStatus() == 1) {
tempFileService.migrateTempFilesToFormal(approveNode.getId(), approveNode.getTempFileIds(), FileNameType.ApproveNode.getValue());
@@ -287,7 +297,14 @@
approveProcess.getApproveId() + "娴佺▼缂栧彿鐨勫鎵归渶瑕佹偍瀹℃牳!!!!!",
Arrays.asList(Long.valueOf(id)),
"/safeProduction/safeWorkApproval?approveType=" + approveProcess.getApproveType() + "&approveId=" + approveProcess.getApproveId());
- } else if (approveProcess.getApproveType() == 9) {
+ } else {
+ sysNoticeService.simpleNoticeByUser(approveProcessType(approveProcess.getApproveType()),
+ approveProcess.getApproveId() + "娴佺▼缂栧彿鐨勫鎵归渶瑕佹偍瀹℃牳!!!!!",
+ Arrays.asList(Long.valueOf(id)),
+ "/collaborativeApproval/approvalProcess?approveType=" + approveProcess.getApproveType() + "&approveId=" + approveProcess.getApproveId());
+ }
+ } else {
+ if (approveProcess.getApproveType() == 9) {
StockInRecord stockInRecord = stockInRecordService.getById(approveNode.getRecordId());
if (approveNode.isInventoryReview()) {
if ("涓嶅悎鏍煎叆搴�".equals(approveNode.getStorageType())) {
@@ -297,22 +314,21 @@
}
stockInRecord.setApproveStatus(2);
stockInRecordService.updateById(stockInRecord);
- sysNoticeService.simpleNoticeByUser(
- approveProcessType(approveProcess.getApproveType()),
- approveProcess.getApproveId() + "娴佺▼缂栧彿鐨勫鎵归渶瑕佹偍瀹℃牳!!!!!",
- Arrays.asList(Long.valueOf(id)),
- "/collaborativeApproval/approvalProcess?approveType=" + approveProcess.getApproveType()
- + "&approveId=" + approveProcess.getApproveId()
- );
- }else {
- stockInRecord.setApproveStatus(3);
- stockInRecordService.updateById(stockInRecord);
}
- } else {
- sysNoticeService.simpleNoticeByUser(approveProcessType(approveProcess.getApproveType()),
- approveProcess.getApproveId() + "娴佺▼缂栧彿鐨勫鎵归渶瑕佹偍瀹℃牳!!!!!",
- Arrays.asList(Long.valueOf(id)),
- "/collaborativeApproval/approvalProcess?approveType=" + approveProcess.getApproveType() + "&approveId=" + approveProcess.getApproveId());
+ }
+ if (approveProcess.getApproveType() == 5) {
+ //閲囪喘鍏ュ簱
+ ApproveProcess process = approveProcessMapper.selectById(approveNode.getProcessId());
+ List<SalesLedgerProduct> salesLedgerProductList = salesLedgerProductMapper.selectList(new LambdaQueryWrapper<SalesLedgerProduct>().in(SalesLedgerProduct::getSalesLedgerId, process.getPurchaseLedgerId())
+ .eq(SalesLedgerProduct::getType, 2));
+ for (SalesLedgerProduct salesLedgerProduct : salesLedgerProductList) {
+ StockInRecord stockInRecord = new StockInRecord();
+ stockInRecord.setStockInNum(salesLedgerProduct.getQuantity());
+ stockInRecord.setProductModelId(salesLedgerProduct.getProductModelId());
+ stockInRecord.setWarnNum(salesLedgerProduct.getWarnNum());
+ stockInRecord.setBatchNo(salesLedgerProduct.getBatchNo());
+ stockInventoryService.updateOrCreateStockInventory(stockInRecord);
+ }
}
}
break;
--
Gitblit v1.9.3