1131功能优化修改

src/main/java/com/neotel/smfcore/common/init/MainTimer.java

@@ -46,11 +46,11 @@ public class MainTimer {
         log.info("开始加载未完成的任务...");
         log.info("开始加载未完成的任务...");
         List<DataLog> unExecuteTasks = dataLogManager.findUnFinishedTasks();
         List<DataLog> unExecuteTasks = dataLogManager.findUnFinishedTasks();
         for (DataLog unExecuteTask : unExecuteTasks) {
         for (DataLog unExecuteTask : unExecuteTasks) {
-            if (unExecuteTask.isExecuting() || unExecuteTask.isWait()) {
+            if (!unExecuteTask.isFinished() && !unExecuteTask.isCancel()) {
                 try {
                 try {
                     taskService.addTaskToExecute(unExecuteTask);
                     taskService.addTaskToExecute(unExecuteTask);
-                }catch (Exception e){
-                    log.error("初始化任务["+unExecuteTask+"]出错："+e);
+                } catch (Exception e) {
+                    log.error("初始化任务[" + unExecuteTask + "]出错：" + e);
                 }
                 }
             }
             }
         }
         }

src/main/java/com/neotel/smfcore/core/system/util/TaskService.java

@@ -134,6 +134,7 @@ public class TaskService {
         task.setStatus(OP_STATUS.WAIT.name());
         task.setStatus(OP_STATUS.WAIT.name());
         task.setSingleOut(isSingleOut);
         task.setSingleOut(isSingleOut);
         task.setOperator(opUserName);
         task.setOperator(opUserName);
+        task.setStorageId(storage.getId());
         addTaskToExecute(task);
         addTaskToExecute(task);
         return "";
         return "";
     }
     }

src/main/java/com/neotel/smfcore/custom/lizhen/util/StationCacheUtil.java

@@ -23,6 +23,13 @@ public class StationCacheUtil {
      */
      */
     private static Map<String, Station> stationMap = new ConcurrentHashMap<>();
     private static Map<String, Station> stationMap = new ConcurrentHashMap<>();
 
 
+    public static void saveBoxToBoxCode(Station station){
+        int boxCurrentNum = station.getBoxCurrentNum();
+        boxCurrentNum ++;
+        station.setBoxCurrentNum(boxCurrentNum);
+        StationCacheUtil.updateStation(station);
+    }
+
     public static void saveReelToBoxCode(Station station) {
     public static void saveReelToBoxCode(Station station) {
         int reelCurrentNum = station.getReelCurrentNum();
         int reelCurrentNum = station.getReelCurrentNum();
         reelCurrentNum++;
         reelCurrentNum++;