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/basic/service/impl/ProductModelServiceImpl.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
index e9dfd73..4a4ece9 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
@@ -155,4 +155,51 @@
throw new ServiceException("瀵煎叆澶辫触");
}
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public int downCopy(ProductModelDto productModelDto) {
+ if (productModelDto == null || productModelDto.getProductId() == null || productModelDto.getTargetProductId() == null) {
+ throw new ServiceException("婧愪骇鍝両D鍜岀洰鏍囦骇鍝両D涓嶈兘涓虹┖");
+ }
+
+ Long sourceProductId = productModelDto.getProductId();
+ Long targetProductId = productModelDto.getTargetProductId();
+
+ if (sourceProductId.equals(targetProductId)) {
+ throw new ServiceException("婧愪骇鍝佸拰鐩爣浜у搧涓嶈兘鐩稿悓");
+ }
+
+ Product sourceProduct = productMapper.selectById(sourceProductId);
+ if (sourceProduct == null) {
+ throw new ServiceException("婧愪骇鍝佷笉瀛樺湪");
+ }
+
+ Product targetProduct = productMapper.selectById(targetProductId);
+ if (targetProduct == null) {
+ throw new ServiceException("鐩爣浜у搧涓嶅瓨鍦�");
+ }
+
+ List<ProductModel> sourceModels = productModelMapper.selectList(
+ new LambdaQueryWrapper<ProductModel>()
+ .eq(ProductModel::getProductId, sourceProductId)
+ .orderByAsc(ProductModel::getId)
+ );
+ if (CollectionUtils.isEmpty(sourceModels)) {
+ throw new ServiceException("婧愪骇鍝佷笅娌℃湁鍙鍒剁殑鍨嬪彿");
+ }
+
+ List<ProductModel> copyList = new ArrayList<>();
+ for (ProductModel sourceModel : sourceModels) {
+ ProductModel copy = new ProductModel();
+ BeanUtils.copyProperties(sourceModel, copy);
+ copy.setId(null);
+ copy.setProductId(targetProductId);
+ copy.setTenantId(null);
+ copyList.add(copy);
+ }
+
+ saveBatch(copyList);
+ return copyList.size();
+ }
}
--
Gitblit v1.9.3