From ecc09e4e86781833b19fbc7a5f056f54d68e802b Mon Sep 17 00:00:00 2001
From: philip <244793088@qq.com>
Date: Wed, 25 Aug 2021 08:54:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=AC=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesnac/common/service/impl/ProdReadyTaskServiceImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 e96cfc30..2260324e 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
@@ -499,7 +499,7 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
             printTag.setOperation(prodReadyTask.getOperation());
             printTag.setItemBo(selectCurrent.getHandle());
             printTag.setIsPrint("false");
-            printTag.setPrintNum(0);
+            printTag.setPrintNum(1);
             printTag.setItem(item);
             printTag.setItemDescription(selectCurrent.getDescription());
 

From a871eb28d845fc01f9d03e12a9a946334ff51035 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Wed, 25 Aug 2021 09:23:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BB=B4=E4=BF=AE?=
 =?UTF-8?q?=E6=8F=90=E6=8A=A5bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equip/service/impl/ResourceRepairTaskServiceImpl.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java
index 0d852bb8..b07df861 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java
@@ -140,8 +140,10 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl<ResourceRepairTas
             throw BusinessException.build("提报人不能为空！！！");
         }
         //调用方法，关闭异常单的状态
-        anomalyService.anomalyReveseRepairShutDown(resourceRepairTask.getObjectBo());
-
+        String objectBo = resourceRepairTask.getObjectBo();
+        if (objectBo != null){
+            anomalyService.anomalyReveseRepairShutDown(objectBo);
+        }
 
         resourceRepairTask.setCreateUser(reportUser);
         resourceRepairTask.setCreatedDateTime(LocalDateTime.now());