From 9dcf20387a41fc71501a5243ee25b74c806b464f Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 26 三月 2026 15:48:56 +0800
Subject: [PATCH] 生产详情返回报废数量，重新计算合格数量等值
---
src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java | 24 +++++++++++++++++++-----
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 4 ++++
src/main/resources/mapper/production/ProductionProductMainMapper.xml | 1 -
src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java | 10 +++++++++-
src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java | 6 ++++++
5 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
index ffe4e19..6ff9df7 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
@@ -43,8 +43,16 @@
@ApiModelProperty(value = "瀹屾垚杩涘害")
private BigDecimal completionStatus;
+ // 鎬讳骇鍑烘暟閲�
+ @ApiModelProperty(value = "鎬讳骇鍑烘暟閲忥紙鍖呭惈鎶ュ簾鏁伴噺锛�")
+ private BigDecimal totalQty;
+
@ApiModelProperty(value = "鎶ュ簾鏁伴噺")
private BigDecimal scrapQty;
+
+ // 涓嶈壇鏁伴噺
+ @ApiModelProperty(value = "涓嶈壇鏁伴噺")
+ private BigDecimal defectiveQuantity;
@ApiModelProperty(value = "宸ュ崟绫诲瀷 姝ｅ父 /杩斿伐杩斾慨")
private String workOrderType;
@@ -63,7 +71,7 @@
private BigDecimal completeQty;
@ApiModelProperty(value = "涓嶈壇鐜�")
- private BigDecimal scrapRate;
+ private BigDecimal defectiveRate;
@ApiModelProperty(value = "鐘舵�佹枃鏈�")
private String statusText;
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
index 8691a21..4618ba0 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -33,6 +33,12 @@
@Excel(name = "鎶ュ簾鏁伴噺")
private BigDecimal scrapQty = BigDecimal.ZERO;
+ // 涓嶈壇鏁伴噺
+ @ApiModelProperty(value = "涓嶈壇鏁伴噺")
+ @Excel(name = "涓嶈壇鏁伴噺")
+ private BigDecimal defectiveQuantity = BigDecimal.ZERO;
+
+ // 鍚堟牸鏁伴噺
@ApiModelProperty(value = "鍚堟牸鏁伴噺")
@Excel(name = "鍚堟牸鏁伴噺")
private BigDecimal qualifiedQty = BigDecimal.ZERO;
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 924d7db..8e15e5d 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
@@ -50,6 +50,8 @@
private ProductionProductOutputMapper productionProductOutputMapper;
@Autowired
private QualityUnqualifiedMapper qualityUnqualifiedMapper;
+ @Autowired
+ private QualityInspectMapper qualityInspectMapper;
@Value("${file.temp-dir}")
private String tempDir;
@@ -189,20 +191,32 @@
productWorkOrderDtos.forEach(productWorkOrderDto -> {
// 鏌ヨ鍏宠仈浜у嚭琛ㄦ暟鎹�
List<ProductionProductMain> productionProductMains = productionProductMainMapper.selectList(Wrappers.<ProductionProductMain>lambdaQuery().eq(ProductionProductMain::getWorkOrderId, productWorkOrderDto.getId()));
+ // 鏌ヨ鎶ュ簾鏁伴噺
BigDecimal scrapQty = BigDecimal.ZERO;
+ // 鏌ヨ涓嶈壇鏁伴噺
+ BigDecimal defectiveQuantity = BigDecimal.ZERO;
if (CollectionUtils.isNotEmpty(productionProductMains)) {
// 璁＄畻鎶ュ簾鏁伴噺
List<Long> mainIds = productionProductMains.stream().map(ProductionProductMain::getId).collect(Collectors.toList());
List<ProductionProductOutput> productionProductOutputs = productionProductOutputMapper.selectList(Wrappers.<ProductionProductOutput>lambdaQuery().in(ProductionProductOutput::getProductMainId, mainIds));
- scrapQty = productionProductOutputs.stream().map(ProductionProductOutput::getScrapQty).reduce(BigDecimal.ZERO, BigDecimal::add);
+ List<QualityInspect> qualityInspects = qualityInspectMapper.selectList(Wrappers.<QualityInspect>lambdaQuery().in(QualityInspect::getProductMainId, mainIds));
+ if (CollectionUtils.isNotEmpty(productionProductOutputs)) {
+ scrapQty = productionProductOutputs.stream().map(ProductionProductOutput::getScrapQty).reduce(BigDecimal.ZERO, BigDecimal::add);
+ }
+ if (CollectionUtils.isNotEmpty(qualityInspects)) {
+ defectiveQuantity = qualityInspects.stream().map(QualityInspect::getDefectiveQuantity).reduce(BigDecimal.ZERO, BigDecimal::add);
+ }
}
- if (productWorkOrderDto.getCompleteQuantity().compareTo(BigDecimal.ZERO) > 0) {
- productWorkOrderDto.setScrapRate(scrapQty.divide(productWorkOrderDto.getCompleteQuantity(), 4, RoundingMode.HALF_UP));
+ BigDecimal totalQuantity = productWorkOrderDto.getCompleteQuantity().add(scrapQty);
+ if (totalQuantity.compareTo(BigDecimal.ZERO) > 0) {
+ productWorkOrderDto.setDefectiveRate(defectiveQuantity.divide(productWorkOrderDto.getCompleteQuantity(), 4, RoundingMode.HALF_UP));
} else {
- productWorkOrderDto.setScrapRate(scrapQty.multiply(BigDecimal.valueOf(100)));
+ productWorkOrderDto.setDefectiveRate(defectiveQuantity.multiply(BigDecimal.valueOf(100)));
}
productWorkOrderDto.setScrapQty(scrapQty);
- productWorkOrderDto.setCompleteQty(productWorkOrderDto.getCompleteQuantity().subtract(scrapQty));
+ productWorkOrderDto.setTotalQty(totalQuantity);
+ productWorkOrderDto.setDefectiveQuantity(defectiveQuantity);
+ productWorkOrderDto.setCompleteQty(productWorkOrderDto.getCompleteQuantity().subtract(defectiveQuantity));
});
}
return productWorkOrderDtos;
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
index bbce752..3722729 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -436,6 +436,10 @@
productionProductMainDtos.forEach(p -> {
QualityInspect qualityInspect = productMainIdToInspectMap.get(p.getId());
if (qualityInspect != null) {
+ // 涓嶈壇鏁伴噺
+ p.setDefectiveQuantity( qualityInspect.getDefectiveQuantity());
+ // 鍚堟牸鏁伴噺 = 鎶ュ伐鏁伴噺-鎶ュ簾鏁伴噺-涓嶈壇鏁伴噺
+ p.setQualifiedQty(p.getQuantity().subtract(p.getScrapQty()).subtract(p.getDefectiveQuantity()));
QualityUnqualified qualityUnqualified = inspectIdToUnqualifiedMap.get(qualityInspect.getId());
if (qualityUnqualified != null) {
p.setDealResult(qualityUnqualified.getDealResult() == null ? "" : qualityUnqualified.getDealResult());
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index c2dc1d8..1b11d4c 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -67,7 +67,6 @@
ppo.quantity,
ppo.scrap_qty,
ppo.other_data,
- (ppo.quantity - ppo.scrap_qty) as qualifiedQty,
pm.unit
from
production_product_main ppm
--
Gitblit v1.9.3