From 5cabba0016c61d51204c7e28bf0613b1cd335327 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 25 三月 2026 15:05:34 +0800
Subject: [PATCH] 工序不合格处理为隔离后，后续工序不继续报工
---
src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java | 118 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 91 insertions(+), 27 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 23190db..924d7db 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
@@ -11,15 +11,13 @@
import com.deepoove.poi.data.Pictures;
import com.ruoyi.common.utils.MatrixToImageWriter;
import com.ruoyi.production.dto.ProductWorkOrderDto;
-import com.ruoyi.production.mapper.ProductProcessRouteItemMapper;
-import com.ruoyi.production.mapper.ProductWorkOrderFileMapper;
-import com.ruoyi.production.mapper.ProductWorkOrderMapper;
-import com.ruoyi.production.mapper.ProductionProductMainMapper;
-import com.ruoyi.production.pojo.ProductProcessRouteItem;
-import com.ruoyi.production.pojo.ProductWorkOrder;
-import com.ruoyi.production.pojo.ProductWorkOrderFile;
-import com.ruoyi.production.pojo.ProductionProductMain;
+import com.ruoyi.production.mapper.*;
+import com.ruoyi.production.pojo.*;
import com.ruoyi.production.service.ProductWorkOrderService;
+import com.ruoyi.quality.mapper.QualityInspectMapper;
+import com.ruoyi.quality.mapper.QualityUnqualifiedMapper;
+import com.ruoyi.quality.pojo.QualityInspect;
+import com.ruoyi.quality.pojo.QualityUnqualified;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -28,11 +26,11 @@
import javax.servlet.http.HttpServletResponse;
import java.io.InputStream;
import java.io.OutputStream;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
@Service
@Transactional(rollbackFor = Exception.class)
@@ -45,7 +43,13 @@
@Autowired
private ProductProcessRouteItemMapper productProcessRouteItemMapper;
@Autowired
+ private ProductProcessMapper productProcessMapper;
+ @Autowired
private ProductionProductMainMapper productionProductMainMapper;
+ @Autowired
+ private ProductionProductOutputMapper productionProductOutputMapper;
+ @Autowired
+ private QualityUnqualifiedMapper qualityUnqualifiedMapper;
@Value("${file.temp-dir}")
private String tempDir;
@@ -54,28 +58,63 @@
public IPage<ProductWorkOrderDto> listPage(Page<ProductWorkOrderDto> page, ProductWorkOrderDto productWorkOrder) {
IPage<ProductWorkOrderDto> productWorkOrderDtoIPage = productWorkOrdermapper.pageProductWorkOrder(page, productWorkOrder);
productWorkOrderDtoIPage.getRecords().forEach(record -> {
- //妫�鏌ヤ笂涓�涓伐搴忔槸鍚﹀凡鎶ュ伐
+ // 鏄惁鑳芥姤宸ワ細 1. 绗竴涓伐搴忚兘鎶ュ伐 2. 涓婁竴涓伐搴忓凡鎶ュ伐 3. 涔嬪墠鐨勫伐搴忔湭琚殧绂�
Integer currentDragSort = record.getDragSort();
if (currentDragSort == null || currentDragSort == 1) {
record.setIsCanReport(true);
} else {
- //鏌ユ壘涓婁竴涓伐搴�
- ProductProcessRouteItem previousItem = productProcessRouteItemMapper.selectOne(
- Wrappers.<ProductProcessRouteItem>lambdaQuery()
- .eq(ProductProcessRouteItem::getProductRouteId, record.getProductRouteId())
- .eq(ProductProcessRouteItem::getDragSort, currentDragSort - 1)
+ // 涓婁竴涓伐搴忔槸鍚﹀凡鎶ュ伐
+ boolean isPreviousReported = productionProductMainMapper.checkPreviousProcessReported(
+ record.getProductRouteId(),
+ currentDragSort
);
+ record.setIsCanReport(isPreviousReported);
- if (previousItem != null) {
- //妫�鏌ヤ笂涓�涓伐搴忔槸鍚︽湁鎶ュ伐璁板綍
- Long count = productionProductMainMapper.selectCount(
- Wrappers.<ProductionProductMain>lambdaQuery()
- .eq(ProductionProductMain::getProductProcessRouteItemId, previousItem.getId())
+ // 涔嬪墠鐨勫伐搴忔槸鍚﹁闅旂
+ if (record.getIsCanReport()) {
+ // 鏌ヨ鎵�鏈変箣鍓嶇殑宸ュ簭锛堟帓搴忓彿灏忎簬褰撳墠宸ュ簭锛�
+ List<ProductProcessRouteItem> previousItems = productProcessRouteItemMapper.selectList(
+ Wrappers.<ProductProcessRouteItem>lambdaQuery()
+ .eq(ProductProcessRouteItem::getProductRouteId, record.getProductRouteId())
+ .lt(ProductProcessRouteItem::getDragSort, currentDragSort)
);
- record.setIsCanReport(count > 0);
- } else {
- record.setIsCanReport(true);
+
+ if (CollectionUtils.isNotEmpty(previousItems)) {
+ // 鎻愬彇涔嬪墠宸ュ簭鐨勫悕绉板垪琛�
+ List<String> previousProcessNames = new ArrayList<>();
+ for (ProductProcessRouteItem item : previousItems) {
+ ProductProcess process = productProcessMapper.selectById(item.getProcessId());
+ if (process != null) {
+ previousProcessNames.add(process.getName());
+ }
+ }
+
+ // 妫�鏌ヤ箣鍓嶇殑宸ュ簭鏄惁鏈夎闅旂鐨勪笉鍚堟牸璁板綍
+ List<QualityUnqualified> unqualifiedList = qualityUnqualifiedMapper.selectUnqualifiedByProcessNames(previousProcessNames);
+ if (CollectionUtils.isNotEmpty(unqualifiedList)) {
+ record.setIsCanReport(false);
+ }
+ }
}
+ }
+
+ // 鏌ヨ褰撳墠瀹為檯鐨勫悎鏍肩巼
+ // 鏌ヨ鍏宠仈浜у嚭琛ㄦ暟鎹�
+ 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;
@@ -143,4 +182,29 @@
}
}
-}
+ @Override
+ public List<ProductWorkOrderDto> getByProductOrderId(Long productOrderId) {
+ List<ProductWorkOrderDto> productWorkOrderDtos = productWorkOrdermapper.getByProductOrderId(productOrderId);
+ if (CollectionUtils.isNotEmpty(productWorkOrderDtos)) {
+ productWorkOrderDtos.forEach(productWorkOrderDto -> {
+ // 鏌ヨ鍏宠仈浜у嚭琛ㄦ暟鎹�
+ List<ProductionProductMain> productionProductMains = productionProductMainMapper.selectList(Wrappers.<ProductionProductMain>lambdaQuery().eq(ProductionProductMain::getWorkOrderId, productWorkOrderDto.getId()));
+ BigDecimal scrapQty = 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);
+ }
+ if (productWorkOrderDto.getCompleteQuantity().compareTo(BigDecimal.ZERO) > 0) {
+ 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));
+ });
+ }
+ return productWorkOrderDtos;
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.3