Merge remote-tracking branch 'origin/master'

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());
 

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());