工单结束导致无法retry问题修改

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -420,10 +420,24 @@ public class LiteOrderCache {
                                 }
                                 //判断是否发送成功
                                 if (ObjectUtil.isNotEmpty(order.getMode())) {
-                                    if (liteOrderItem.getStatus() == OrderItemStatus.notify_fail) {
+                                    if (liteOrderItem.getStatus() == OrderItemStatus.notify_fail || liteOrderItem.getStatus()==OrderItemStatus.executFail) {
+                                        log.info(" liteOrderItem ,PN="+liteOrderItem.getPn()+",ri="+liteOrderItem.getRi()+",当前状态："+liteOrderItem.getStatus()+",暂不关闭工单");
                                         closed = false;
                                         break;
                                     }
+                                    if(liteOrderItem.getSelectItems()!=null){
+                                        for (LiteOrderItem item :
+                                                liteOrderItem.getSelectItems()) {
+                                            if (item.getStatus() == OrderItemStatus.notify_fail || item.getStatus()==OrderItemStatus.executFail) {
+                                                log.info(" item ,PN="+item.getPn()+",ri="+item.getRi()+",当前状态："+item.getStatus()+",暂不关闭工单");
+                                                closed = false;
+                                                break;
+                                            }
+                                        }
+                                    }
+                                    if(!closed){
+                                        break;
+                                    }
                                 }
                             }
                             if (closed) {
@@ -440,7 +454,7 @@ public class LiteOrderCache {
                         log.error("工单[" + orderNo + "]的任务[" + task.getBarcode() + "]完成时,状态为:" + task.getStatus());
                     }
 
-                    if (order.getFinishedReelCount() >= order.getTaskReelCount()) {
+                    if (order.getFinishedReelCount() >= order.getTaskReelCount()&&ObjectUtil.isEmpty(order.getMode())) {
                         log.info("工单[" + orderNo + "]的出库任务已完成,共出库:" + order.getFinishedReelCount() + " 盘");
                         finishedOrderTasks(order);
                     }