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/production/service/impl/ProductWorkOrderServiceImpl.java | 85 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 82 insertions(+), 3 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 8e15e5d..b73d629 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
@@ -11,6 +11,7 @@
import com.deepoove.poi.data.Pictures;
import com.ruoyi.common.utils.MatrixToImageWriter;
import com.ruoyi.production.dto.ProductWorkOrderDto;
+import com.ruoyi.production.dto.ProductStructureDto;
import com.ruoyi.production.mapper.*;
import com.ruoyi.production.pojo.*;
import com.ruoyi.production.service.ProductWorkOrderService;
@@ -30,6 +31,7 @@
import java.math.RoundingMode;
import java.net.URLEncoder;
import java.util.*;
+import java.util.function.Function;
import java.util.stream.Collectors;
@Service
@@ -45,9 +47,15 @@
@Autowired
private ProductProcessMapper productProcessMapper;
@Autowired
+ private ProductProcessRouteMapper productProcessRouteMapper;
+ @Autowired
+ private ProductStructureMapper productStructureMapper;
+ @Autowired
private ProductionProductMainMapper productionProductMainMapper;
@Autowired
private ProductionProductOutputMapper productionProductOutputMapper;
+ @Autowired
+ private ProductionProductInputMapper productionProductInputMapper;
@Autowired
private QualityUnqualifiedMapper qualityUnqualifiedMapper;
@Autowired
@@ -59,6 +67,7 @@
@Override
public IPage<ProductWorkOrderDto> listPage(Page<ProductWorkOrderDto> page, ProductWorkOrderDto productWorkOrder) {
IPage<ProductWorkOrderDto> productWorkOrderDtoIPage = productWorkOrdermapper.pageProductWorkOrder(page, productWorkOrder);
+ Map<String, BigDecimal> bomInputQtyCache = new HashMap<>();
productWorkOrderDtoIPage.getRecords().forEach(record -> {
// 鏄惁鑳芥姤宸ワ細 1. 绗竴涓伐搴忚兘鎶ュ伐 2. 涓婁竴涓伐搴忓凡鎶ュ伐 3. 涔嬪墠鐨勫伐搴忔湭琚殧绂�
Integer currentDragSort = record.getDragSort();
@@ -67,7 +76,7 @@
} else {
// 涓婁竴涓伐搴忔槸鍚﹀凡鎶ュ伐
boolean isPreviousReported = productionProductMainMapper.checkPreviousProcessReported(
- record.getProductRouteId(),
+ record.getId(),
currentDragSort
);
record.setIsCanReport(isPreviousReported);
@@ -92,7 +101,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);
}
@@ -118,6 +133,62 @@
} else {
record.setActualQualifiedRate((record.getCompleteQuantity().subtract(totalScrapQty)).multiply(BigDecimal.valueOf(100)));
}
+
+ // 鏌ヨ褰撳墠宸ュ崟瀵瑰簲浜у搧缁撴瀯涓殑鏍囧噯鎶曞叆鏁伴噺
+ String bomInputQtyCacheKey = record.getProductRouteId() + "_" + record.getProcessId() + "_" + record.getPlanQuantity();
+ BigDecimal bomInputQty = bomInputQtyCache.get(bomInputQtyCacheKey);
+ if (bomInputQty == null) {
+ bomInputQty = BigDecimal.ZERO;
+ ProductProcessRoute productProcessRoute = productProcessRouteMapper.selectById(record.getProductRouteId());
+ if (productProcessRoute != null && productProcessRoute.getBomId() != null && record.getProcessId() != null) {
+ List<ProductStructureDto> productStructureDtos = productStructureMapper.listBybomAndProcess(
+ productProcessRoute.getBomId(),
+ record.getProcessId()
+ );
+
+ if (CollectionUtils.isEmpty(productStructureDtos)) {
+ bomInputQty = record.getPlanQuantity() == null ? BigDecimal.ZERO : record.getPlanQuantity();
+ } else {
+ Set<Long> parentIds = productStructureDtos.stream()
+ .map(ProductStructureDto::getParentId)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toSet());
+
+ Map<Long, ProductStructureDto> parentMap = new HashMap<>();
+ if (CollectionUtils.isNotEmpty(parentIds)) {
+ parentMap = productStructureMapper.selectByIds(parentIds)
+ .stream()
+ .collect(Collectors.toMap(ProductStructureDto::getId, Function.identity(), (a, b) -> a));
+ }
+
+ BigDecimal planQty = record.getPlanQuantity() == null ? BigDecimal.ZERO : record.getPlanQuantity();
+ for (ProductStructureDto productStructureDto : productStructureDtos) {
+ BigDecimal childQty = productStructureDto.getUnitQuantity();
+ if (childQty == null || childQty.compareTo(BigDecimal.ZERO) <= 0) {
+ continue;
+ }
+
+ BigDecimal parentQty = BigDecimal.ONE;
+ if (productStructureDto.getParentId() != null) {
+ ProductStructureDto parent = parentMap.get(productStructureDto.getParentId());
+ if (parent != null && parent.getUnitQuantity() != null && parent.getUnitQuantity().compareTo(BigDecimal.ZERO) > 0) {
+ parentQty = parent.getUnitQuantity();
+ }
+ }
+
+ if (parentQty.compareTo(BigDecimal.ZERO) <= 0) {
+ continue;
+ }
+
+ bomInputQty = bomInputQty.add(
+ childQty.divide(parentQty, 6, RoundingMode.HALF_UP).multiply(planQty)
+ );
+ }
+ }
+ }
+ bomInputQtyCache.put(bomInputQtyCacheKey, bomInputQty);
+ }
+ record.setBomInputQty(bomInputQty);
});
return productWorkOrderDtoIPage;
}
@@ -156,6 +227,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());
@@ -195,6 +267,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 +277,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 +291,7 @@
} else {
productWorkOrderDto.setDefectiveRate(defectiveQuantity.multiply(BigDecimal.valueOf(100)));
}
+ productWorkOrderDto.setInputQty(inputQty);
productWorkOrderDto.setScrapQty(scrapQty);
productWorkOrderDto.setTotalQty(totalQuantity);
productWorkOrderDto.setDefectiveQuantity(defectiveQuantity);
@@ -221,4 +300,4 @@
}
return productWorkOrderDtos;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3