From f4c288c55d08c04cd026508b358beebfcdce5fc2 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 22 五月 2026 09:29:09 +0800
Subject: [PATCH] feat(product): 添加产品型号向下复制功能并优化生产报工重量计算 - 在ProductController中新增downCopy接口实现产品型号批量复制功能 - 将ProductionProductMainDto中的bomInputQty字段重命名为inputWeight - 在ProductionProductMainServiceImpl中添加JSON解析逻辑支持从otherData中提取投入重量 - 新增resolveInputWeight、findParameterValue、findFieldValue等工具方法处理复杂参数解析 - 为ProductModelDto添加targetProductId字段用于指定复制目标 - 修复销售台账按调度员ID和姓名分组的SQL查询问题 - 优化库存服务中剩余数量计算的空值处理逻辑 - 完善生产投料数量为空时的默认值处理机制
---
src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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 97a9912..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);
}
}
@@ -314,6 +316,20 @@
stockInRecordService.updateById(stockInRecord);
}
}
+ 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;
case 2:
--
Gitblit v1.9.3