From 2d48e5c7ea5ce13e9191920c15293dd4b707f5da Mon Sep 17 00:00:00 2001
From: "JinLu.Yin" <411641505@qq.com>
Date: Mon, 29 Aug 2022 20:39:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E7=A8=8B=E6=A3=80=E9=AA=8C=E5=8D=95?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7=E5=94=AF=E4=B8=80=E6=80=A7=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ktg/mes/qc/controller/QcIpqcController.java |  9 +++++++++
 .../java/com/ktg/mes/qc/mapper/QcIpqcMapper.java    |  7 +++++++
 .../java/com/ktg/mes/qc/service/IQcIpqcService.java |  8 ++++++++
 .../ktg/mes/qc/service/impl/QcIpqcServiceImpl.java  | 13 +++++++++++++
 .../src/main/resources/mapper/qc/QcIpqcMapper.xml   |  4 ++++
 5 files changed, 41 insertions(+)

diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIpqcController.java b/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIpqcController.java
index 3171d52..4f722c8 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIpqcController.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIpqcController.java
@@ -2,6 +2,8 @@ package com.ktg.mes.qc.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ktg.common.constant.UserConstants;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -77,6 +79,10 @@ public class QcIpqcController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody QcIpqc qcIpqc)
     {
+        if(UserConstants.NOT_UNIQUE.equals(qcIpqcService.checkIpqcCodeUnique(qcIpqc))){
+            return AjaxResult.error("检测单编码已存在！");
+        }
+
         return toAjax(qcIpqcService.insertQcIpqc(qcIpqc));
     }
 
@@ -88,6 +94,9 @@ public class QcIpqcController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody QcIpqc qcIpqc)
     {
+        if(UserConstants.NOT_UNIQUE.equals(qcIpqcService.checkIpqcCodeUnique(qcIpqc))){
+            return AjaxResult.error("检测单编码已存在！");
+        }
         return toAjax(qcIpqcService.updateQcIpqc(qcIpqc));
     }
 
diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/mapper/QcIpqcMapper.java b/ktg-mes/src/main/java/com/ktg/mes/qc/mapper/QcIpqcMapper.java
index 990b4ea..441c9af 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/qc/mapper/QcIpqcMapper.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/qc/mapper/QcIpqcMapper.java
@@ -27,6 +27,13 @@ public interface QcIpqcMapper
      */
     public List<QcIpqc> selectQcIpqcList(QcIpqc qcIpqc);
 
+    /**
+     * 验证检测编码是否唯一
+     * @param qcIpqc
+     * @return
+     */
+    public QcIpqc checkIpqcCodeUnique(QcIpqc qcIpqc);
+
     /**
      * 新增过程检验单
      * 
diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/service/IQcIpqcService.java b/ktg-mes/src/main/java/com/ktg/mes/qc/service/IQcIpqcService.java
index 33b3fc0..135524b 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/qc/service/IQcIpqcService.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/qc/service/IQcIpqcService.java
@@ -27,6 +27,14 @@ public interface IQcIpqcService
      */
     public List<QcIpqc> selectQcIpqcList(QcIpqc qcIpqc);
 
+
+    /**
+     * 检查检测编码是否唯一
+     * @param qcIpqc
+     * @return
+     */
+    public String checkIpqcCodeUnique(QcIpqc qcIpqc);
+
     /**
      * 新增过程检验单
      * 
diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/service/impl/QcIpqcServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/qc/service/impl/QcIpqcServiceImpl.java
index 5dcf6f6..98dbc39 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/qc/service/impl/QcIpqcServiceImpl.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/qc/service/impl/QcIpqcServiceImpl.java
@@ -1,7 +1,10 @@
 package com.ktg.mes.qc.service.impl;
 
 import java.util.List;
+
+import com.ktg.common.constant.UserConstants;
 import com.ktg.common.utils.DateUtils;
+import com.ktg.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ktg.mes.qc.mapper.QcIpqcMapper;
@@ -44,6 +47,16 @@ public class QcIpqcServiceImpl implements IQcIpqcService
         return qcIpqcMapper.selectQcIpqcList(qcIpqc);
     }
 
+    @Override
+    public String checkIpqcCodeUnique(QcIpqc qcIpqc) {
+        QcIpqc ipqc = qcIpqcMapper.checkIpqcCodeUnique(qcIpqc);
+        Long ipqcId = qcIpqc.getIpqcId()==null?-1:qcIpqc.getIpqcId();
+        if(StringUtils.isNotNull(ipqc) && ipqc.getIpqcId().longValue() != ipqcId.longValue()){
+            return UserConstants.NOT_UNIQUE;
+        }
+        return UserConstants.UNIQUE;
+    }
+
     /**
      * 新增过程检验单
      * 
diff --git a/ktg-mes/src/main/resources/mapper/qc/QcIpqcMapper.xml b/ktg-mes/src/main/resources/mapper/qc/QcIpqcMapper.xml
index 0d02d57..9ee548b 100644
--- a/ktg-mes/src/main/resources/mapper/qc/QcIpqcMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/qc/QcIpqcMapper.xml
@@ -99,6 +99,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectQcIpqcVo"/>
         where ipqc_id = #{ipqcId}
     </select>
+
+    <select id="checkIpqcCodeUnique" parameterType="QcIpqc" resultMap="QcIpqcResult">
+        select * from qc_ipqc where ipqc_code = #{ipqcCode}
+    </select>
         
     <insert id="insertQcIpqc" parameterType="QcIpqc" useGeneratedKeys="true" keyProperty="ipqcId">
         insert into qc_ipqc