From 74a9c98088594674ec5e7e850080f8d4d1adc8b1 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 20 三月 2026 14:23:53 +0800
Subject: [PATCH] 优化代码

---
 src/main/resources/mapper/production/ProductWorkOrderMapper.xml                  |    5 -----
 src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java |   38 ++++++++++++++++++++++++++++----------
 2 files changed, 28 insertions(+), 15 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 dc6f264..8c38ddf 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java
@@ -11,14 +11,8 @@
 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -28,8 +22,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.*;
+import java.util.stream.Collectors;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -43,6 +40,8 @@
     private ProductProcessRouteItemMapper productProcessRouteItemMapper;
     @Autowired
     private ProductionProductMainMapper productionProductMainMapper;
+    @Autowired
+    private ProductionProductOutputMapper productionProductOutputMapper;
 
     @Value("${file.temp-dir}")
     private String tempDir;
@@ -142,7 +141,26 @@
 
     @Override
     public List<ProductWorkOrderDto> getByProductOrderId(Long productOrderId) {
-        return productWorkOrdermapper.getByProductOrderId(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(), 2, RoundingMode.HALF_UP));
+                } else {
+                    productWorkOrderDto.setScrapRate(scrapQty.multiply(BigDecimal.valueOf(100)));
+                }
+                productWorkOrderDto.setCompleteQty(productWorkOrderDto.getCompleteQuantity().subtract(scrapQty));
+            });
+        }
+        return productWorkOrderDtos;
     }
-
 }
diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index d105ba1..15a210f 100644
--- a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -66,10 +66,7 @@
         po.nps_no AS productOrderNpsNo,
         ppri.drag_sort,
         ppri.product_route_id,
-        sum(ppo.scrap_qty) scrapQty,
         ROUND(pwo.complete_quantity / pwo.plan_quantity * 100, 2) AS completionStatus,
-        ROUND(sum(ppo.scrap_qty) / pwo.complete_quantity * 100, 2) AS scrapRate,
-        (pwo.complete_quantity - sum(ppo.scrap_qty)) AS completeQty,
         CASE
         WHEN pwo.complete_quantity &gt;= pwo.plan_quantity THEN '宸茬敓浜�'
         WHEN pwo.complete_quantity &gt; 0 AND pwo.complete_quantity &lt; pwo.plan_quantity THEN '鐢熶骇涓�'
@@ -86,8 +83,6 @@
         LEFT JOIN product_process pp ON pp.id = ppri.process_id
         LEFT JOIN product_model pm ON pm.id = ppri.product_model_id
         LEFT JOIN product p ON p.id = pm.product_id
-        LEFT JOIN production_product_main ppm ON ppm.work_order_id = pwo.id
-        LEFT JOIN production_product_output ppo ON ppo.product_main_id = ppm.id
         where po.id=#{productOrderId}
         order by ppri.drag_sort
     </select>

--
Gitblit v1.9.3