From c9061ea258b694daa8b81caa1646f4c7797e3340 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期六, 28 三月 2026 15:42:34 +0800
Subject: [PATCH] 计算工单总投入数量
---
src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java | 9 +++++++++
src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java | 4 ++++
2 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
index 6ff9df7..c6556f1 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
@@ -54,6 +54,10 @@
@ApiModelProperty(value = "涓嶈壇鏁伴噺")
private BigDecimal defectiveQuantity;
+ // 鎶曞叆鏁伴噺
+ @ApiModelProperty(value = "鎶曞叆鏁伴噺")
+ private BigDecimal inputQty;
+
@ApiModelProperty(value = "宸ュ崟绫诲瀷 姝ｅ父 /杩斿伐杩斾慨")
private String workOrderType;
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
index 8e15e5d..29378ac 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
@@ -49,6 +49,8 @@
@Autowired
private ProductionProductOutputMapper productionProductOutputMapper;
@Autowired
+ private ProductionProductInputMapper productionProductInputMapper;
+ @Autowired
private QualityUnqualifiedMapper qualityUnqualifiedMapper;
@Autowired
private QualityInspectMapper qualityInspectMapper;
@@ -195,6 +197,8 @@
BigDecimal scrapQty = BigDecimal.ZERO;
// 鏌ヨ涓嶈壇鏁伴噺
BigDecimal defectiveQuantity = BigDecimal.ZERO;
+ // 鏌ヨ鎶曞叆鏁伴噺
+ BigDecimal inputQty = BigDecimal.ZERO;
if (CollectionUtils.isNotEmpty(productionProductMains)) {
// 璁＄畻鎶ュ簾鏁伴噺
List<Long> mainIds = productionProductMains.stream().map(ProductionProductMain::getId).collect(Collectors.toList());
@@ -203,6 +207,10 @@
if (CollectionUtils.isNotEmpty(productionProductOutputs)) {
scrapQty = productionProductOutputs.stream().map(ProductionProductOutput::getScrapQty).reduce(BigDecimal.ZERO, BigDecimal::add);
}
+ List<ProductionProductInput> productionProductInputs = productionProductInputMapper.selectList(Wrappers.<ProductionProductInput>lambdaQuery().in(ProductionProductInput::getProductMainId, mainIds));
+ if (CollectionUtils.isNotEmpty(productionProductInputs)) {
+ inputQty = productionProductInputs.stream().map(ProductionProductInput::getQuantity).reduce(BigDecimal.ZERO, BigDecimal::add);
+ }
if (CollectionUtils.isNotEmpty(qualityInspects)) {
defectiveQuantity = qualityInspects.stream().map(QualityInspect::getDefectiveQuantity).reduce(BigDecimal.ZERO, BigDecimal::add);
}
@@ -213,6 +221,7 @@
} else {
productWorkOrderDto.setDefectiveRate(defectiveQuantity.multiply(BigDecimal.valueOf(100)));
}
+ productWorkOrderDto.setInputQty(inputQty);
productWorkOrderDto.setScrapQty(scrapQty);
productWorkOrderDto.setTotalQty(totalQuantity);
productWorkOrderDto.setDefectiveQuantity(defectiveQuantity);
--
Gitblit v1.9.3