From 5c3b17f25f956da7707924c6d9d4b994ecf4c613 Mon Sep 17 00:00:00 2001
From: philip <244793088@qq.com>
Date: Tue, 27 Jul 2021 14:36:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8A=A5=E5=BC=82=E5=B8=B8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=94=A8=E6=88=B7=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/service/impl/InspectionTaskServiceImpl.java       | 3 +++
 meapi/src/main/resources/mapper/NcCodeMapper.xml             | 2 +-
 .../mesnac/quality/service/impl/SelfReportServiceImpl.java   | 5 +++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionTaskServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionTaskServiceImpl.java
index 2f1b3648..9e825c24 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionTaskServiceImpl.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionTaskServiceImpl.java
@@ -81,6 +81,9 @@ public class InspectionTaskServiceImpl extends ServiceImpl<InspectionTaskMapper,
         if(StringUtil.isEmpty(taskHandle)){
             throw new BaseException("保存失败,请先进行检索数据!");
         }
+        if(StringUtil.notBlank(task.getResult())){
+            throw new BaseException("检验任务已经保存完成!");
+        }
         task.setComments((String) paramMap.get("COMMENTS"));
         task.setStatus(Constants.INSPECTION_TASK_STATUS_COMPLETE);
         task.setModifyUser(user);
diff --git a/meapi/src/main/resources/mapper/NcCodeMapper.xml b/meapi/src/main/resources/mapper/NcCodeMapper.xml
index 5107aedf..20f2d09e 100644
--- a/meapi/src/main/resources/mapper/NcCodeMapper.xml
+++ b/meapi/src/main/resources/mapper/NcCodeMapper.xml
@@ -376,7 +376,7 @@
         SELECT nc.NC_CODE,nct.DESCRIPTION FROM NC_CODE nc
         LEFT JOIN NC_CODE_T NCT ON nc.HANDLE=NCT.NC_CODE_BO AND NCT.LOCALE=#{locale}
         JOIN NC_GROUP_MEMBER NGM ON nc.HANDLE=NGM.NC_CODE_OR_GROUP_GBO
-        WHERE NGM.NC_GROUP_BO = #{ncGroupBO}
+        WHERE NGM.NC_GROUP_BO = #{ncGroupBO} and  nc.NC_CATEGORY='FAILURE'
         <if test="globalQuery!=null and globalQuery!=''">
             AND (nc.NC_CODE LIKE '%${globalQuery}%' or nct.DESCRIPTION  LIKE '%${globalQuery}%')
         </if>
diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/SelfReportServiceImpl.java b/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/SelfReportServiceImpl.java
index 95e373d0..1c9cd56a 100644
--- a/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/SelfReportServiceImpl.java
+++ b/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/SelfReportServiceImpl.java
@@ -87,6 +87,7 @@ public class SelfReportServiceImpl extends ServiceImpl<SelfReportMapper, SelfRep
         String ncQty = (String)map.get("ncQty");
         String comments = (String)map.get("comments");
         String location=(String)map.get("location");
+        String userGroup=(String)map.get("userGroup");
         List<SelfReportRequest> list = (List<SelfReportRequest>)map.get("ncList");
         ObjectMapper mapper = new ObjectMapper();
         list = mapper.convertValue(list, new TypeReference<List<SelfReportRequest>>() {});
@@ -109,11 +110,11 @@ public class SelfReportServiceImpl extends ServiceImpl<SelfReportMapper, SelfRep
                     stringBuilder.append(",");
                 }
             }
-            anomalyService.createAnomalyTask(Constants.ABNORMAL_RESRCE,resrce,shopOrder,sfc,stringBuilder.toString(),location,ncQty,comments);
+            anomalyService.createAnomalyTask(Constants.ABNORMAL_RESRCE,resrce,shopOrder,sfc,stringBuilder.toString(),location,ncQty,comments,userGroup);
         }
         List<SelfReportRequest> otherAbnormalList = list.stream().filter(selfReportRequest -> selfReportRequest.getType().equals(Constants.ABNORMAL_OTHER)).collect(Collectors.toList());
         if (otherAbnormalList.size()>0){
-            anomalyService.createAnomalyTask(Constants.ABNORMAL_RESRCE,resrce,shopOrder,sfc,"",location,ncQty,comments);
+            anomalyService.createAnomalyTask(Constants.ABNORMAL_RESRCE,resrce,shopOrder,sfc,"",location,ncQty,comments,userGroup);
         }
         QueryWrapper<SelfReport> queryWrapper=new QueryWrapper<>();
         queryWrapper.eq(SelfReport.SFC,sfc);