From 4d99e718536ac77dff26dde8da7a59cdc9b52de8 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 20 五月 2026 10:13:57 +0800
Subject: [PATCH] fix:1.生产报工优化
---
src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java | 46 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 38 insertions(+), 8 deletions(-)
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..982009f 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
@@ -49,7 +49,11 @@
@Autowired
private ProductionProductOutputMapper productionProductOutputMapper;
@Autowired
+ private ProductionProductInputMapper productionProductInputMapper;
+ @Autowired
private QualityUnqualifiedMapper qualityUnqualifiedMapper;
+ @Autowired
+ private QualityInspectMapper qualityInspectMapper;
@Value("${file.temp-dir}")
private String tempDir;
@@ -65,7 +69,7 @@
} else {
// 涓婁竴涓伐搴忔槸鍚﹀凡鎶ュ伐
boolean isPreviousReported = productionProductMainMapper.checkPreviousProcessReported(
- record.getProductRouteId(),
+ record.getId(),
currentDragSort
);
record.setIsCanReport(isPreviousReported);
@@ -90,7 +94,13 @@
}
// 妫�鏌ヤ箣鍓嶇殑宸ュ簭鏄惁鏈夎闅旂鐨勪笉鍚堟牸璁板綍
- List<QualityUnqualified> unqualifiedList = qualityUnqualifiedMapper.selectUnqualifiedByProcessNames(previousProcessNames);
+ List<QualityUnqualified> unqualifiedList = Collections.emptyList();
+ if (CollectionUtils.isNotEmpty(previousProcessNames)) {
+ unqualifiedList = qualityUnqualifiedMapper.selectUnqualifiedByProductOrderAndProcessNames(
+ record.getProductOrderId(),
+ previousProcessNames
+ );
+ }
if (CollectionUtils.isNotEmpty(unqualifiedList)) {
record.setIsCanReport(false);
}
@@ -154,6 +164,7 @@
put("productName", productWorkOrderDto.getProductName());
put("planQuantity", productWorkOrderDto.getPlanQuantity());
put("model", productWorkOrderDto.getModel());
+ put("unit", productWorkOrderDto.getUnit());
put("completeQuantity", productWorkOrderDto.getCompleteQuantity());
put("scrapQty", productWorkOrderDto.getScrapQty());
put("planStartTime", productWorkOrderDto.getPlanStartTime());
@@ -189,22 +200,41 @@
productWorkOrderDtos.forEach(productWorkOrderDto -> {
// 鏌ヨ鍏宠仈浜у嚭琛ㄦ暟鎹�
List<ProductionProductMain> productionProductMains = productionProductMainMapper.selectList(Wrappers.<ProductionProductMain>lambdaQuery().eq(ProductionProductMain::getWorkOrderId, productWorkOrderDto.getId()));
+ // 鏌ヨ鎶ュ簾鏁伴噺
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());
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);
+ }
+ 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);
+ }
}
- 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.setInputQty(inputQty);
productWorkOrderDto.setScrapQty(scrapQty);
- productWorkOrderDto.setCompleteQty(productWorkOrderDto.getCompleteQuantity().subtract(scrapQty));
+ productWorkOrderDto.setTotalQty(totalQuantity);
+ productWorkOrderDto.setDefectiveQuantity(defectiveQuantity);
+ productWorkOrderDto.setCompleteQty(productWorkOrderDto.getCompleteQuantity().subtract(defectiveQuantity));
});
}
return productWorkOrderDtos;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3