From 6256daf29f4c44944fa71a7dbd211b06bf1a495d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 25 五月 2026 09:46:20 +0800
Subject: [PATCH] feat: 报工投入用“投入重量/数量”
---
src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java b/src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java
index 119f5fc..27ebea8 100644
--- a/src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java
+++ b/src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java
@@ -17,6 +17,8 @@
import java.math.BigDecimal;
import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
@Component
public class StockUtils {
@@ -101,6 +103,18 @@
stockInventoryService.addstockInventory(stockInventoryDto);
}
+ public void addStock(Long productModelId, BigDecimal quantity, String recordType, Long recordId,
+ String processCategory, String voltage) {
+ StockInventoryDto stockInventoryDto = new StockInventoryDto();
+ stockInventoryDto.setRecordId(recordId);
+ stockInventoryDto.setRecordType(String.valueOf(recordType));
+ stockInventoryDto.setQualitity(quantity);
+ stockInventoryDto.setProductModelId(productModelId);
+ stockInventoryDto.setProcessCategory(processCategory);
+ stockInventoryDto.setVoltage(voltage);
+ stockInventoryService.addstockInventory(stockInventoryDto);
+ }
+
/**
* 鍚堟牸鍏ュ簱锛堜笉瀹℃牳锛�
*
@@ -118,6 +132,18 @@
stockInventoryService.addstockInventoryNoReview(stockInventoryDto);
}
+ public void addStockNoReview(Long productModelId, BigDecimal quantity, String recordType, Long recordId,
+ String processCategory, String voltage) {
+ StockInventoryDto stockInventoryDto = new StockInventoryDto();
+ stockInventoryDto.setRecordId(recordId);
+ stockInventoryDto.setRecordType(String.valueOf(recordType));
+ stockInventoryDto.setQualitity(quantity);
+ stockInventoryDto.setProductModelId(productModelId);
+ stockInventoryDto.setProcessCategory(processCategory);
+ stockInventoryDto.setVoltage(voltage);
+ stockInventoryService.addstockInventoryNoReview(stockInventoryDto);
+ }
+
/**
* 鍚堟牸鍑哄簱
*
@@ -126,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));
@@ -135,6 +161,7 @@
if (batchNo !=null && !batchNo.isEmpty()) {
stockInventoryDto.setBatchNo(batchNo);
}
+ stockInventoryDto.setStockId(stockId);
stockInventoryService.subtractStockInventory(stockInventoryDto);
}
@@ -149,11 +176,28 @@
}
public void deleteStockOutRecord(Long recordId, String recordType) {
- StockOutRecord one = stockOutRecordService.getOne(new QueryWrapper<StockOutRecord>()
+ List<StockOutRecord> one = stockOutRecordService.list(new QueryWrapper<StockOutRecord>()
.lambda().eq(StockOutRecord::getRecordId, recordId)
.eq(StockOutRecord::getRecordType, recordType));
if (ObjectUtils.isNotEmpty(one)) {
- stockOutRecordService.batchDelete(Collections.singletonList(one.getId()));
+ List<Long> idList = one.stream()
+ .map(StockOutRecord::getId)
+ .collect(Collectors.toList());
+ 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