cancelAndDisable 先禁用库位，再取消存在的 任务

src/main/java/com/neotel/smfcore/core/device/rest/DeviceController.java

@@ -640,31 +640,47 @@ public class DeviceController {
     public ResultBean cancelAndDisable(HttpServletRequest request) {
     public ResultBean cancelAndDisable(HttpServletRequest request) {
         String posName = request.getParameter("posName");
         String posName = request.getParameter("posName");
         if (StringUtils.isNotBlank(posName)) {
         if (StringUtils.isNotBlank(posName)) {
+            //首先禁用库位，有任务的话取消
+            StoragePos pos = storagePosManager.getByPosName(posName);
+            if (pos != null) {
+                pos.setEnabled(false);
+                storagePosManager.save(pos);
+                dataCache.updateDisablePos(pos);
+                log.info(" cancelAndDisable  禁用库位[" + posName + "]");
+                DeviceMessageUtil.addEnabledPosMessage(pos, SecurityUtils.getCurrentUsername());
+                Storage storage = dataCache.getStorageById(pos.getStorageId());
+                if (storage != null) {
+                    dataCache.reloadStorage(storage, "");
+                }
+            }
+
             DataLog task = null;
             DataLog task = null;
             List<DataLog> allTasks = taskService.getAllTasks();
             List<DataLog> allTasks = taskService.getAllTasks();
             for (DataLog dataLog : allTasks) {
             for (DataLog dataLog : allTasks) {
-                if (posName.equals(dataLog.getPosName()) && dataLog.isCheckOutTask() && !dataLog.isFinished()) {
+                if (posName.equals(dataLog.getPosName()) && !dataLog.isFinished()) {
                     task = dataLog;
                     task = dataLog;
                     break;
                     break;
                 }
                 }
             }
             }
             if (task != null) {
             if (task != null) {
                 boolean result = taskService.cancelTask(task);
                 boolean result = taskService.cancelTask(task);
-                if (result) {
-                    StoragePos pos = storagePosManager.getByPosName(posName);
-                    if (pos != null) {
-                        pos.setEnabled(false);
-                        storagePosManager.save(pos);
-                        dataCache.updateDisablePos(pos);
-                        log.info("任务[" + task.getId() + "] posName[" + task.getPosName() + "] Reel Id[" + task.getBarcode() + "]取消成功，禁用库位[" + task.getPosName() + "]");
-                        DeviceMessageUtil.addEnabledPosMessage(pos, SecurityUtils.getCurrentUsername());
-                        Storage storage = dataCache.getStorageById(pos.getStorageId());
-                        if (storage != null) {
-                            dataCache.reloadStorage(storage, "");
-                        }
-                    }
-                    return ResultBean.newOkResult("");
-                }
+                log.info("cancelAndDisable 任务[" + task.getId() + "] posName[" + task.getPosName() + "] Reel Id[" + task.getBarcode() + "]取消 结果： " + result);
+                return ResultBean.newOkResult("");
+//                if (result) {
+//                    StoragePos pos = storagePosManager.getByPosName(posName);
+//                    if (pos != null) {
+//                        pos.setEnabled(false);
+//                        storagePosManager.save(pos);
+//                        dataCache.updateDisablePos(pos);
+//                        log.info("任务[" + task.getId() + "] posName[" + task.getPosName() + "] Reel Id[" + task.getBarcode() + "]取消成功，禁用库位[" + task.getPosName() + "]");
+//                        DeviceMessageUtil.addEnabledPosMessage(pos, SecurityUtils.getCurrentUsername());
+//                        Storage storage = dataCache.getStorageById(pos.getStorageId());
+//                        if (storage != null) {
+//                            dataCache.reloadStorage(storage, "");
+//                        }
+//                    }
+//                return ResultBean.newOkResult("");
+//                }
             } else {
             } else {
                 return ResultBean.newErrorResult(1, "smfcore.task.notExist", "Task does not exist");
                 return ResultBean.newErrorResult(1, "smfcore.task.notExist", "Task does not exist");
             }
             }