From afe79b87533a262fdb8493916a68c472beda9a04 Mon Sep 17 00:00:00 2001
From: philip <244793088@qq.com>
Date: Thu, 29 Jul 2021 15:17:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=89=8D=E5=87=86=E5=A4=87=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../foreverwin/mesnac/common/service/ProdReadyTaskService.java  | 2 +-
 .../mesnac/common/service/impl/ProdReadyTaskServiceImpl.java    | 2 +-
 common/src/main/resources/mapper/ProdReadyTaskMapper.xml        | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/ProdReadyTaskService.java b/common/src/main/java/com/foreverwin/mesnac/common/service/ProdReadyTaskService.java
index f781337c..4d3602a2 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/service/ProdReadyTaskService.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/service/ProdReadyTaskService.java
@@ -34,7 +34,7 @@ public interface ProdReadyTaskService extends IService<ProdReadyTask> {
 
     ProdReadyTask loadProExecute(String taskBo);
 
-    List<Map<String, Object>> getInspectionDetailList(Map<String, String> param);
+    List<Map<String, Object>>    getInspectionDetailList(Map<String, String> param);
 
     boolean saveResult(ProdReadyTask prodReadyTask);
 }
\ No newline at end of file
diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java
index 77e05505..3550b006 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java
@@ -269,7 +269,7 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
         if (byId.getStatus().equals(STATUS_CANCEL)) {
             throw new BaseException("产前准备任务任务已取消");
         }
-        if (byId.getStatus().equals(STATUS_FINISH)) {
+        if (byId.getStatus().equals(STATUS_FINISH)&&byId.getResult().equals(Constants.RSESULT_OK)) {
             throw new BaseException("产前准备任务任务已完成");
         }
         List<ProdReadyTaskDetail> prodReadyTaskDetailList = prodReadyTask.getProdReadyTaskDetailList();
diff --git a/common/src/main/resources/mapper/ProdReadyTaskMapper.xml b/common/src/main/resources/mapper/ProdReadyTaskMapper.xml
index 255fc0c7..82b40b43 100644
--- a/common/src/main/resources/mapper/ProdReadyTaskMapper.xml
+++ b/common/src/main/resources/mapper/ProdReadyTaskMapper.xml
@@ -640,6 +640,7 @@
         <if test="entity.resrce!=null and entity.resrce!='' "> AND ZPRT.RESRCE=#{entity.resrce}</if>
         <if test="entity.dispatchNo!=null and entity.dispatchNo!='' "> AND ZSD.DISPATCH_NO=#{entity.dispatchNo}</if>
         <if test="entity.status!=null and entity.status!='' "> AND ZPRT.STATUS=#{entity.status}</if>
+        <if test="entity.result!=null and entity.result!='' "> AND ZPRT.RESULT=#{entity.result}</if>
         <if test="entity.sfcStepStatus!=null and entity.sfcStepStatus!='' and entity.sfcStepStatus=='COMPLETE' "> AND ZSD.DISPATCH_STATUS=#{entity.sfcStepStatus}</if>
         <if test="entity.sfcStepStatus!=null and entity.sfcStepStatus!='' and entity.sfcStepStatus!='COMPLETE' "> AND ZSD.DISPATCH_STATUS!='COMPLETE'</if>
         <if test="entity.sfc!=null and entity.sfc!='' "> AND ZPRT.SFC=#{entity.sfc}</if>