Merge remote-tracking branch 'origin/master'

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/job/JobStatusEnum.java

@@ -1,11 +1,11 @@
 package com.win.module.wms.enums.job;
 
 public enum JobStatusEnum {
-    OPEN(1), // 待处理
+    PROCESSING(1), // 处理中
-    DOING(2), // 执行中
+    PARTIALLY_COMPLETED(2), // 部分完成
-    DONE(3), // 完成
+    COMPLETED(3), // 完成
-    CLOSED(4), // 关闭
+    TERMINATION(4), // 中止
-    CANCELLED(5); // 放弃
+    ;
 
     private final Integer code;
 
@@ -28,6 +28,6 @@ public enum JobStatusEnum {
                 return jobStatusEnum;
             }
         }
-        return OPEN;
+        return PROCESSING;
     }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/job/JobStatusState.java

@@ -14,7 +14,7 @@ public class JobStatusState {
      * 构造函数，默认创建
      */
     public JobStatusState() {
-        this.jobStatusEnum = JobStatusEnum.OPEN;
+        this.jobStatusEnum = JobStatusEnum.PROCESSING;
     }
 
     /**
@@ -34,12 +34,12 @@ public class JobStatusState {
     }
 
     /**
-     * 当前状态是否可以修改为执行中状态
+     * 执行
      * @return
      */
     public boolean doing() {
-        if(this.jobStatusEnum.getCode() == JobStatusEnum.OPEN.getCode()) {
+        if(this.jobStatusEnum.getCode() == JobStatusEnum.PROCESSING.getCode()) {
-            this.jobStatusEnum = JobStatusEnum.DOING;
+            this.jobStatusEnum = JobStatusEnum.PARTIALLY_COMPLETED;
             return Boolean.TRUE;
         } else {
             return Boolean.FALSE;
@@ -47,37 +47,25 @@ public class JobStatusState {
     }
 
     /**
-     * 当前状态是否可以修改为关闭状态
+     * 完成
-     * @return
-     */
-    public boolean closed() {
-        if(this.jobStatusEnum.getCode() == JobStatusEnum.OPEN.getCode()) {
-            this.jobStatusEnum = JobStatusEnum.CLOSED;
-            return Boolean.TRUE;
-        } else {
-            return Boolean.FALSE;
-        }
-    }
-
-    /**
-     * 当前状态是否可以修改为完成状态
      * @return
      */
     public boolean done() {
-        if(this.jobStatusEnum.getCode() == JobStatusEnum.DOING.getCode()) {
+        if(this.jobStatusEnum.getCode() == JobStatusEnum.PROCESSING.getCode() || this.jobStatusEnum.getCode() == JobStatusEnum.PARTIALLY_COMPLETED.getCode()) {
-            this.jobStatusEnum = JobStatusEnum.DONE;
+            this.jobStatusEnum = JobStatusEnum.COMPLETED;
             return Boolean.TRUE;
         } else {
             return Boolean.FALSE;
         }
     }
+
     /**
-     * 当前状态是否可以修改为放弃状态
+     * 中止
      * @return
      */
-    public boolean cancelled() {
+    public boolean abort() {
-        if(this.jobStatusEnum.getCode() == JobStatusEnum.DOING.getCode()) {
+        if(this.jobStatusEnum.getCode() == JobStatusEnum.PROCESSING.getCode() || this.jobStatusEnum.getCode() == JobStatusEnum.PARTIALLY_COMPLETED.getCode()) {
-            this.jobStatusEnum = JobStatusEnum.CANCELLED;
+            this.jobStatusEnum = JobStatusEnum.TERMINATION;
             return Boolean.TRUE;
         } else {
             return Boolean.FALSE;