Merge remote-tracking branch 'origin/master'

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/request/RequestStatusState.java

@@ -101,11 +101,11 @@ public class RequestStatusState {
     }
 
     /**
-     * 关闭
+     * 关闭，其余操作在任务中执行
      * @return
      */
     public boolean closed() {
-        if(this.requestStatusEnum.getCode() == RequestStatusEnum.APPROVAL.getCode()) {
+        if(this.requestStatusEnum.getCode() == RequestStatusEnum.NEW.getCode() || this.requestStatusEnum.getCode() == RequestStatusEnum.APPROVAL.getCode() || this.requestStatusEnum.getCode() == RequestStatusEnum.PASS.getCode()) {
             this.requestStatusEnum = RequestStatusEnum.PASS;
             return Boolean.TRUE;
         } else {
@@ -113,19 +113,6 @@ public class RequestStatusState {
         }
     }
 
-    /**
-     * 执行
-     * @return
-     */
-    public boolean processing() {
-        if(this.requestStatusEnum.getCode() == RequestStatusEnum.PASS.getCode()) {
-            this.requestStatusEnum = RequestStatusEnum.PROCESSING;
-            return Boolean.TRUE;
-        } else {
-            return Boolean.FALSE;
-        }
-    }
-
     /**
      * 获取可执行的状态机
      * @return