Merge branch 'refs/heads/b_lms' into master_merge

lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java

@@ -1827,6 +1827,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                         jo.put("point_code4", whereJson.getString("device_code"));
                         jo.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("输送线四个点任务"));
                     } else {
+                        jo.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("输送线->满轴缓存位"));
                         //空载具缓存位缺少空载具，下发一个确定终点的空载具缓存位->输送线任务
                         // 创建前先判断是否有已创建相同任务
                         List<SchBaseTask> existTaskList = taskService.list(new LambdaUpdateWrapper<SchBaseTask>()

lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/TaskStatusEnum.java

@@ -8,7 +8,8 @@ public enum TaskStatusEnum {
     START_AND_POINT("04", "起点终点确认"),
     ISSUE("05", "下发"),
     EXECUTING("06", "执行中"),
-    FINISHED("07", "完成");
+    FINISHED("07", "完成"),
+    CANCEL("08", "取消");
 
     private String name;
     private String code;