From 078232736976c2cde78f2ff59e32b4e89c93a749 Mon Sep 17 00:00:00 2001
From: "JinLu.Yin" <411641505@qq.com>
Date: Sat, 21 May 2022 00:01:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=BA=E9=99=B7=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/qc/controller/QcIqcDefectController.java   | 14 ++------------
 .../java/com/ktg/mes/qc/domain/QcIqcDefect.java    | 12 ++++++------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIqcDefectController.java b/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIqcDefectController.java
index 2938700..44597ed 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIqcDefectController.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIqcDefectController.java
@@ -97,20 +97,10 @@ public class QcIqcDefectController extends BaseController
             for (QcIqcDefect defect: defects
                  ) {
                 if(StringUtils.isNotNull(defect.getRecordId())){
-                    if("Y".equals(defect.getDeleteflag())){
-                        qcIqcDefectService.deleteQcIqcDefectByRecordId(defect.getRecordId());
-                    }else {
-                        qcIqcDefectService.updateQcIqcDefect(defect);
-                    }
+                    qcIqcDefectService.updateQcIqcDefect(defect);
                 }else {
-                    if("Y".equals(defect.getDeleteflag())){
-                        //doNothing
-                    }else {
-                        qcIqcDefectService.insertQcIqcDefect(defect);
-                    }
-
+                    qcIqcDefectService.insertQcIqcDefect(defect);
                 }
-
             }
         }
 
diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcIqcDefect.java b/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcIqcDefect.java
index ca1bf70..2dfec90 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcIqcDefect.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcIqcDefect.java
@@ -43,7 +43,7 @@ public class QcIqcDefect extends BaseEntity
     @Excel(name = "缺陷数量")
     private Long defectQuantity;
 
-    private String deleteflag;
+    private String flag;
 
     /** 预留字段1 */
     private String attr1;
@@ -116,12 +116,12 @@ public class QcIqcDefect extends BaseEntity
         this.attr1 = attr1;
     }
 
-    public String getDeleteflag() {
-        return deleteflag;
+    public String getFlag() {
+        return flag;
     }
 
-    public void setDeleteflag(String deleteflag) {
-        this.deleteflag = deleteflag;
+    public void setFlag(String flag) {
+        this.flag = flag;
     }
 
     public String getAttr1()
@@ -165,7 +165,7 @@ public class QcIqcDefect extends BaseEntity
                 ", defectName='" + defectName + '\'' +
                 ", defectLevel='" + defectLevel + '\'' +
                 ", defectQuantity=" + defectQuantity +
-                ", deleteflag='" + deleteflag + '\'' +
+                ", flag='" + flag + '\'' +
                 ", attr1='" + attr1 + '\'' +
                 ", attr2='" + attr2 + '\'' +
                 ", attr3=" + attr3 +