From a34f7d669aa91045dc661bceae9a78793b989410 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 25 三月 2026 16:58:23 +0800
Subject: [PATCH] 提交质检时,如果合格率低于标准合格率,发送通知给管理员

---
 src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java |   18 +++---------------
 1 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
index 7cf30f3..bbce752 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -109,7 +109,7 @@
                     productProcessRouteItem.getProductRouteId(),
                     currentDragSort
             );
-            if (isPreviousReported) {
+            if (!isPreviousReported) {
                 throw new RuntimeException("涓婁竴涓伐搴忓皻鏈姤宸ワ紝涓嶈兘杩涜褰撳墠宸ュ簭鎶ュ伐");
             }
 
@@ -185,7 +185,7 @@
             productStructureDtos.add(productStructureDto);
         }
         for (ProductStructureDto productStructureDto : productStructureDtos) {
-
+            System.out.println(productStructureDto.getProductModelId());
             ProductionProductInput productionProductInput = new ProductionProductInput();
             productionProductInput.setProductModelId(productStructureDto.getProductModelId());
             productionProductInput.setQuantity(productStructureDto.getUnitQuantity().multiply(dto.getQuantity()));
@@ -208,18 +208,6 @@
 
         //鍚堟牸鏁伴噺=鎶ュ伐鏁伴噺-鎶ュ簾鏁伴噺
         BigDecimal productQty = productionProductOutput.getQuantity().subtract(productionProductOutput.getScrapQty());
-        // 鍚堟牸鐜�=鍚堟牸鏁伴噺/鎶ュ伐鏁伴噺
-        BigDecimal productQtyRate = productQty.divide(productionProductOutput.getQuantity(), 2, RoundingMode.HALF_UP)
-                .multiply(new BigDecimal("100"));
-        // 璇ュ伐搴忕殑鍚堟牸鐜� < 鍚堟牸鐜�
-        if (productQtyRate.compareTo(productProcess.getQualifiedRate()) < 0) {
-            // 鍙戦�侀�氱煡缁欑鐞嗗憳
-            sysNoticeService.simpleNoticeByUser("鎶ュ伐鎻愮ず",
-                    String.format("%s鐢熶骇璁㈠崟锛�%s宸ュ簭鍚堟牸鐜�%.2f%%浣庝簬鏍囧噯%.2f%%", productOrder.getNpsNo(), productProcess.getName(), productQtyRate, productProcess.getQualifiedRate()),
-                    Arrays.asList(Long.valueOf(1L)),
-                    "/productionManagement/productionReporting");
-        }
-
         List<ProductProcessRouteItem> productProcessRouteItems = productProcessRouteItemMapper.selectList(Wrappers.<ProductProcessRouteItem>lambdaQuery().eq(ProductProcessRouteItem::getProductRouteId, productProcessRouteItem.getProductRouteId()));
         //鍙湁鍚堟牸鏁伴噺>0鎵嶈兘澧炲姞鐩稿簲鏁版嵁
         if (productQty.compareTo(BigDecimal.ZERO) > 0) {
@@ -243,7 +231,7 @@
                 qualityInspect.setProcess(process);
                 qualityInspect.setInspectState(0);
                 qualityInspect.setInspectType(inspectType);
-                qualityInspect.setDefectiveQuantity(productionProductOutput.getScrapQty());
+                qualityInspect.setDefectiveQuantity(BigDecimal.ZERO);
                 qualityInspect.setProductMainId(productionProductMain.getId());
                 qualityInspect.setProductModelId(productModel.getId());
                 qualityInspectMapper.insert(qualityInspect);

--
Gitblit v1.9.3