From fb372dc6633cd9cb189a51076a75c4c9489c4a8c Mon Sep 17 00:00:00 2001
From: YiLiLin <Yili_Lin@fw-mes.com>
Date: Wed, 7 Jun 2023 13:45:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A3=80=E9=AA=8C=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/foreverwin/iep/qms/entity/QmsQcItem.java    |  4 ++++
 .../iep/qms/controller/QmsQcItemController.java     |  5 +++++
 .../iep/qms/service/impl/QmsQcItemServiceImpl.java  | 13 +++++++++----
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/qms-api/src/main/java/com/foreverwin/iep/qms/entity/QmsQcItem.java b/qms-api/src/main/java/com/foreverwin/iep/qms/entity/QmsQcItem.java
index d326c44..4f01a4b 100644
--- a/qms-api/src/main/java/com/foreverwin/iep/qms/entity/QmsQcItem.java
+++ b/qms-api/src/main/java/com/foreverwin/iep/qms/entity/QmsQcItem.java
@@ -1,6 +1,7 @@
 package com.foreverwin.iep.qms.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -98,4 +99,7 @@ public class QmsQcItem extends Model<QmsQcItem> {
      */
     @ApiModelProperty(value = "修改时间")
     private LocalDateTime modifiedDateTime;
+
+    @TableField(exist = false)
+    private boolean existQcPlan;
 }
diff --git a/qms-core/src/main/java/com/foreverwin/iep/qms/controller/QmsQcItemController.java b/qms-core/src/main/java/com/foreverwin/iep/qms/controller/QmsQcItemController.java
index 5f81e34..6f5bf3b 100644
--- a/qms-core/src/main/java/com/foreverwin/iep/qms/controller/QmsQcItemController.java
+++ b/qms-core/src/main/java/com/foreverwin/iep/qms/controller/QmsQcItemController.java
@@ -86,4 +86,9 @@ public class QmsQcItemController {
         qmsQcItemService.delete(sid);
         return R.ok();
     }
+
+    @GetMapping("/info/{qcItem}")
+    public R getOne(@PathVariable("qcItem") String qcItem) {
+        return R.ok(qmsQcItemService.getOne(TenantContextHolder.getTenantId(), qcItem));
+    }
 }
diff --git a/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsQcItemServiceImpl.java b/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsQcItemServiceImpl.java
index dbedb8d..4e8ca8c 100644
--- a/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsQcItemServiceImpl.java
+++ b/qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsQcItemServiceImpl.java
@@ -36,9 +36,14 @@ public class QmsQcItemServiceImpl extends ServiceImpl<QmsQcItemMapper, QmsQcItem
 
     @Override
     public QmsQcItem getOne(String site, String qcItem) {
-        return getOne(Wrappers.lambdaQuery(QmsQcItem.class)
-                              .eq(QmsQcItem::getSite, site)
-                              .eq(QmsQcItem::getQcItem, qcItem));
+        QmsQcItem qmsQcItem = getOne(Wrappers.lambdaQuery(QmsQcItem.class)
+                                             .eq(QmsQcItem::getSite, site)
+                                             .eq(QmsQcItem::getQcItem, qcItem));
+        if (ObjectUtil.isNotNull(qmsQcItem)) {
+            qmsQcItem.setExistQcPlan(getQmsQcPlanDetailService().count(Wrappers.lambdaQuery(QmsQcPlanDetail.class)
+                                                                               .eq(QmsQcPlanDetail::getQcItemSid, qmsQcItem.getSid())) > 0);
+        }
+        return qmsQcItem;
     }
 
     @Transactional
@@ -53,7 +58,7 @@ public class QmsQcItemServiceImpl extends ServiceImpl<QmsQcItemMapper, QmsQcItem
             throw BusinessException.build(I18nUtil.getI18nText("qc.item.error13"));
         }
 
-        if (!ObjectUtil.isNull(oriQcItem)) {
+        if (ObjectUtil.isNull(oriQcItem)) {
             qmsQcItem.setSid(SidUtils.genSid());
             qmsQcItem.setCreatedDateTime(LocalDateTime.now());
             qmsQcItem.setCreatedUser(SecurityUtils.getUserName());