发送11的时候,服务器进行出库

myproject/src/main/java/com/myproject/webapp/controller/webService/TaskService.java

@@ -1242,28 +1242,31 @@ public class TaskService implements ITaskService {
                                 }
                             }
                             if (task != null){
+                                if (!task.isEnd() && !task.isFinished() ) {
+
                                     log.info(task.getBarcode() + "已从库位[" + task.getPosName() + "]放到仓门口");
                                     //finishedTaskMap.remove(task.getBarcode());
                                     //postOutNotification(dataCache.getSettings().getOutNotifyApi(), task.getBarcode(), task.getCid());
-                                if(dataCache.needConnectWeiChuang()){
-                                    String result = WebServiceClient.NotifyCarrierUnload(task.getBarcode(),task.getCid());
-                                    if(!result.contains("success")){
-                                        log.error("第一次发送["+task.getBarcode()+"]放到仓门口通知失败:" + result);
-                                        result = WebServiceClient.NotifyCarrierUnload(task.getBarcode(),task.getCid());
-                                        if(!result.contains("success")){
-                                            log.error("第二次发送["+task.getBarcode()+"]放到仓门口通知失败:" + result);
-                                            result = WebServiceClient.NotifyCarrierUnload(task.getBarcode(),task.getCid());
-                                            if(!result.contains("success")){
-                                                log.error("第三次发送["+task.getBarcode()+"]放到仓门口通知失败:" + result);
+                                    if (dataCache.needConnectWeiChuang()) {
+                                        String result = WebServiceClient.NotifyCarrierUnload(task.getBarcode(), task.getCid());
+                                        if (!result.contains("success")) {
+                                            log.error("第一次发送[" + task.getBarcode() + "]放到仓门口通知失败:" + result);
+                                            result = WebServiceClient.NotifyCarrierUnload(task.getBarcode(), task.getCid());
+                                            if (!result.contains("success")) {
+                                                log.error("第二次发送[" + task.getBarcode() + "]放到仓门口通知失败:" + result);
+                                                result = WebServiceClient.NotifyCarrierUnload(task.getBarcode(), task.getCid());
+                                                if (!result.contains("success")) {
+                                                    log.error("第三次发送[" + task.getBarcode() + "]放到仓门口通知失败:" + result);
                                                 }
                                             }
                                         }
-                                    log.info(task.getBarcode()+"通知结果为:"+result);
-                                    if (result.contains("success")){
+                                        log.info(task.getBarcode() + "通知结果为:" + result);
+                                        if (result.contains("success")) {
                                             checkoutFinished(task);
                                             task.setStatus(StorageConstants.OP_STATUS.END.name());
                                             dataLogDao.save(task);
-                                        finishedTaskMap.put(task.getBarcode(),task);
+                                            finishedTaskMap.put(task.getBarcode(), task);
+                                        }
                                     }
                                 }
                             }
@@ -1342,11 +1345,14 @@ public class TaskService implements ITaskService {
             if(task.getPosId() == null) continue;
             if(task.isCheckOutTask()){
                 if(task.getPosId().equals(pos.getId())){
-                    log.info("库位【"+pos.getPosName()+"已在出库列表中,忽略】");
-                    return "库位【"+pos.getPosName()+"已在出库列表中,忽略】";
+                    if (!task.isCancel()) {
+                        log.info("库位【" + pos.getPosName() + "已在出库列表中,忽略】");
+                        return "库位【" + pos.getPosName() + "已在出库列表中,忽略】";
+                    } else {
+                        finishedTaskMap.remove(task.getId());
+                    }
                 }
             }
-
         }
 
         if(dataCache.needConnectWeiChuang()){