Merge remote-tracking branch 'origin/master'

common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java

@@ -252,7 +252,7 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
                 if (list.size() > 0) {
                     ProdReadyTask prodReadyTask = list.get(0);
                     if (prodReadyTask.getStatus().equals(STATUS_CANCEL)) {
-                        throw new BaseException("产前准备任务已取消");
+                       continue;
                     }
                     prodReadyTask.setStatus(STATUS_CANCEL);
                     LocalDateTime now = LocalDateTime.now();