From b584d2d89076149ad0e60cb67a3efcacda33b5e1 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 24 三月 2026 14:05:59 +0800
Subject: [PATCH] 实际合格率低于【合格率】时,每个【生产工单】、【生产报工】台账需要标红显示。并发送消息到管理员,内容为:【xxx生产订单,xx工序合格率xx%低于标准xx%】

---
 src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
index 5ef224b..8691a21 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -10,7 +10,6 @@
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 
 @Data
 @ExcelIgnoreUnannotated
@@ -34,6 +33,10 @@
     @Excel(name = "鎶ュ簾鏁伴噺")
     private BigDecimal scrapQty = BigDecimal.ZERO;
 
+    @ApiModelProperty(value = "鍚堟牸鏁伴噺")
+    @Excel(name = "鍚堟牸鏁伴噺")
+    private BigDecimal qualifiedQty = BigDecimal.ZERO;
+
     //浜у搧鍚嶇О
     @Excel(name = "浜у搧鍚嶇О")
     private String productName;
@@ -55,9 +58,20 @@
     private LocalDate schedulingDate;
     private String schedulingUserName;
     private String customerName;
+    //宸ュ簭
+    @Excel(name = "宸ュ簭")
     private String process;
+    // 宸ュ簭鍚堟牸鐜�
+    private BigDecimal processQualifiedRate;
+    // 瀹為檯鍚堟牸鐜�
+    private BigDecimal actualQualifiedRate;
     private BigDecimal workHours;
     private BigDecimal wages;
 
+    // 鍏朵粬鏁版嵁
+    private String otherData;
 
+    // 涓嶅悎鏍煎鐞嗙粨鏋�
+    @ApiModelProperty(value = "涓嶅悎鏍煎鐞嗙粨鏋�")
+    private String dealResult;
 }

--
Gitblit v1.9.3