diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/job/JobStatusEnum.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/job/JobStatusEnum.java index c6582b8f..526fefed 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/job/JobStatusEnum.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/job/JobStatusEnum.java @@ -1,10 +1,10 @@ package com.win.module.wms.enums.job; public enum JobStatusEnum { - PROCESSING(1), // 处理中 - PARTIALLY_COMPLETED(2), // 部分完成 + PENDING(1), // 待处理 + PROCESSING(2), // 进行中 COMPLETED(3), // 完成 - TERMINATION(4), // 中止 + CLOSED(4), // 关闭 ; private final Integer code; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/job/JobStatusState.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/job/JobStatusState.java index 829f9ee0..67ce9957 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/job/JobStatusState.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/job/JobStatusState.java @@ -34,12 +34,12 @@ public class JobStatusState { } /** - * 执行 + * 承接 * @return */ - public boolean doing() { - if(this.jobStatusEnum.getCode() == JobStatusEnum.PROCESSING.getCode()) { - this.jobStatusEnum = JobStatusEnum.PARTIALLY_COMPLETED; + public boolean accept() { + if(this.jobStatusEnum.getCode() == JobStatusEnum.PENDING.getCode()) { + this.jobStatusEnum = JobStatusEnum.PROCESSING; return Boolean.TRUE; } else { return Boolean.FALSE; @@ -47,12 +47,12 @@ public class JobStatusState { } /** - * 完成 + * 放弃 * @return */ - public boolean done() { - if(this.jobStatusEnum.getCode() == JobStatusEnum.PROCESSING.getCode() || this.jobStatusEnum.getCode() == JobStatusEnum.PARTIALLY_COMPLETED.getCode()) { - this.jobStatusEnum = JobStatusEnum.COMPLETED; + public boolean abandon() { + if(this.jobStatusEnum.getCode() == JobStatusEnum.PROCESSING.getCode()) { + this.jobStatusEnum = JobStatusEnum.PENDING; return Boolean.TRUE; } else { return Boolean.FALSE; @@ -60,12 +60,12 @@ public class JobStatusState { } /** - * 中止 + * 执行 * @return */ - public boolean abort() { - if(this.jobStatusEnum.getCode() == JobStatusEnum.PROCESSING.getCode() || this.jobStatusEnum.getCode() == JobStatusEnum.PARTIALLY_COMPLETED.getCode()) { - this.jobStatusEnum = JobStatusEnum.TERMINATION; + public boolean execute() { + if(this.jobStatusEnum.getCode() == JobStatusEnum.PROCESSING.getCode()) { + this.jobStatusEnum = JobStatusEnum.COMPLETED; return Boolean.TRUE; } else { return Boolean.FALSE; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/order/OrderStatusEnum.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/order/OrderStatusEnum.java index 527f0491..2075345c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/order/OrderStatusEnum.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/order/OrderStatusEnum.java @@ -2,10 +2,10 @@ package com.win.module.wms.enums.order; public enum OrderStatusEnum { - READY(0), // 准备 - PUBLISHED(1), // 发布 - CLOSED(2), // 关闭 - COMPLETED(3), // 已完成 + READY(1), // 准备 + PUBLISHED(2), // 发布 + CLOSED(3), // 关闭 + COMPLETED(4), // 已完成 ; private final Integer code; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/plan/PlanStatusEnum.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/plan/PlanStatusEnum.java index d8439966..2ee174a1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/plan/PlanStatusEnum.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/plan/PlanStatusEnum.java @@ -2,13 +2,13 @@ package com.win.module.wms.enums.plan; public enum PlanStatusEnum { - NEW(0), // 新增 - REVIEWING(1), // 审批中 - AGREED(2), // 审批通过 - REFUSED(3), // 审批驳回 - CLOSED(4), // 关闭 - PUBLISHED(5), // 发布 - COMPLETED(6), // 已完成 + NEW(1), // 新增 + REVIEWING(2), // 审批中 + AGREED(3), // 审批通过 + REFUSED(4), // 审批驳回 + CLOSED(5), // 关闭 + PUBLISHED(6), // 发布 + COMPLETED(7), // 已完成 ; private final Integer code; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/request/RequestStatusEnum.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/request/RequestStatusEnum.java index 9030789a..ea5947b0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/request/RequestStatusEnum.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/request/RequestStatusEnum.java @@ -2,15 +2,15 @@ package com.win.module.wms.enums.request; public enum RequestStatusEnum { - NEW(0), // 新增 - REVIEWING(1), // 审批中 - AGREED(2), // 审批通过 - REFUSED(3), // 审批驳回 - CLOSED(4), // 关闭 - HANDLING(5), // 处理中 - PARTIAL(6), // 部分完成 - COMPLETED(7), // 已完成 - ABORT(8), // 中止 + NEW(1), // 新增 + REVIEWING(2), // 审批中 + AGREED(3), // 审批通过 + REFUSED(4), // 审批驳回 + CLOSED(5), // 关闭 + HANDLING(6), // 处理中 + PARTIAL(7), // 部分完成 + COMPLETED(8), // 已完成 + ABORT(9), // 中止 ; private final Integer code;