From c8b387728909a6de2109505439308aaa9f44d3de Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 25 三月 2026 13:21:16 +0800
Subject: [PATCH] 库存不足提示需改成对应的投入产品库存不足（
---
src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 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 8c38ddf..b979cc4 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
@@ -73,6 +73,25 @@
record.setIsCanReport(true);
}
}
+
+ // 鏌ヨ褰撳墠瀹為檯鐨勫悎鏍肩巼
+ // 鏌ヨ鍏宠仈浜у嚭琛ㄦ暟鎹�
+ List<ProductionProductMain> productionProductMains = productionProductMainMapper.selectList(Wrappers.<ProductionProductMain>lambdaQuery().eq(ProductionProductMain::getWorkOrderId, record.getId()));
+ BigDecimal totalScrapQty = 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));
+ totalScrapQty = productionProductOutputs.stream().map(ProductionProductOutput::getScrapQty).reduce(BigDecimal.ZERO, BigDecimal::add);
+ }
+ if (record.getCompleteQuantity().compareTo(BigDecimal.ZERO) > 0) {
+ record.setActualQualifiedRate((record.getCompleteQuantity().subtract(totalScrapQty))
+ .divide(record.getCompleteQuantity(), 2, RoundingMode.HALF_UP)
+ .multiply(new BigDecimal("100"))
+ );
+ } else {
+ record.setActualQualifiedRate((record.getCompleteQuantity().subtract(totalScrapQty)).multiply(BigDecimal.valueOf(100)));
+ }
});
return productWorkOrderDtoIPage;
}
@@ -154,10 +173,11 @@
scrapQty = productionProductOutputs.stream().map(ProductionProductOutput::getScrapQty).reduce(BigDecimal.ZERO, BigDecimal::add);
}
if (productWorkOrderDto.getCompleteQuantity().compareTo(BigDecimal.ZERO) > 0) {
- productWorkOrderDto.setScrapRate(scrapQty.divide(productWorkOrderDto.getCompleteQuantity(), 2, RoundingMode.HALF_UP));
+ productWorkOrderDto.setScrapRate(scrapQty.divide(productWorkOrderDto.getCompleteQuantity(), 4, RoundingMode.HALF_UP));
} else {
productWorkOrderDto.setScrapRate(scrapQty.multiply(BigDecimal.valueOf(100)));
}
+ productWorkOrderDto.setScrapQty(scrapQty);
productWorkOrderDto.setCompleteQty(productWorkOrderDto.getCompleteQuantity().subtract(scrapQty));
});
}
--
Gitblit v1.9.3