From 455b965c6435b5359bb5c25f2b6810dbc06f5481 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期五, 13 二月 2026 17:56:39 +0800
Subject: [PATCH] Merge branch 'dev_New_kthg' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_kthg

---
 src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java
index 10c4f5f..b0e9c0d 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java
@@ -52,10 +52,9 @@
     public boolean updateByDDR(DeviceDefectRecord deviceDefectRecord) {
         String status = deviceDefectRecord.getStatus();
         if (status.equals("涓ラ噸缂洪櫡")) {
-//            deviceDefectRecord.setStatus("姝e父");
-//            deviceDefectRecord.setEliminateTime(LocalDateTime.now());
             throw new RuntimeException("涓ラ噸缂洪櫡-璁惧缁翠慨鍚庢洿鏂颁负姝e父鐘舵��");
-        } else if (status.equals("涓�鑸己闄�")) {
+        }
+        if (status.equals("涓�鑸己闄�")) {
             deviceDefectRecord.setStatus("姝e父");
         }
         deviceDefectRecord.setEliminateTime(LocalDateTime.now());

--
Gitblit v1.9.3