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/procurementrecord/utils/StockUtils.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java b/src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java
index 288f721..27ebea8 100644
--- a/src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java
+++ b/src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java
@@ -152,7 +152,7 @@
* @param recordType
* @param recordId
*/
- public void substractStock(Long productModelId, BigDecimal quantity, String recordType, Long recordId,String batchNo) {
+ public void substractStock(Long productModelId, BigDecimal quantity, String recordType, Long recordId,String batchNo,Long stockId) {
StockInventoryDto stockInventoryDto = new StockInventoryDto();
stockInventoryDto.setRecordId(recordId);
stockInventoryDto.setRecordType(String.valueOf(recordType));
@@ -161,6 +161,7 @@
if (batchNo !=null && !batchNo.isEmpty()) {
stockInventoryDto.setBatchNo(batchNo);
}
+ stockInventoryDto.setStockId(stockId);
stockInventoryService.subtractStockInventory(stockInventoryDto);
}
@@ -185,4 +186,18 @@
stockOutRecordService.batchDelete(idList);
}
}
+
+ /**
+ * 浠呮寜recordId鍒犻櫎鍑哄簱璁板綍锛堢敤浜巖ecordType涓哄姩鎬佸�肩殑鍦烘櫙锛�
+ */
+ public void deleteStockOutRecordByRecordId(Long recordId) {
+ List<StockOutRecord> one = stockOutRecordService.list(new QueryWrapper<StockOutRecord>()
+ .lambda().eq(StockOutRecord::getRecordId, recordId));
+ if (ObjectUtils.isNotEmpty(one)) {
+ List<Long> idList = one.stream()
+ .map(StockOutRecord::getId)
+ .collect(Collectors.toList());
+ stockOutRecordService.batchDelete(idList);
+ }
+ }
}
--
Gitblit v1.9.3