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 new file mode 100644 index 00000000..527f0491 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/order/OrderStatusEnum.java @@ -0,0 +1,33 @@ +package com.win.module.wms.enums.order; + +public enum OrderStatusEnum { + + READY(0), // 准备 + PUBLISHED(1), // 发布 + CLOSED(2), // 关闭 + COMPLETED(3), // 已完成 + ; + private final Integer code; + + OrderStatusEnum(int code) { + this.code = code; + } + + public int getCode() { + return code; + } + + /** + * 用状态值获取枚举 + * @param status + * @return + */ + static OrderStatusEnum getJobStatusEnum(int status) { + for (OrderStatusEnum jobStatusEnum : values()) { + if (jobStatusEnum.getCode() == status) { + return jobStatusEnum; + } + } + return READY; + } +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/order/OrderStatusState.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/order/OrderStatusState.java new file mode 100644 index 00000000..129062c5 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/order/OrderStatusState.java @@ -0,0 +1,96 @@ +package com.win.module.wms.enums.order; + +/** + * 订单状态机 + */ +public class OrderStatusState { + + /** + * 当前状态枚举 + */ + private OrderStatusEnum orderStatusEnum; + + /** + * 构造函数,默认创建 + */ + public OrderStatusState() { + this.orderStatusEnum = OrderStatusEnum.READY; + } + + /** + * 构造函数,当前状态 + * @param status + */ + public OrderStatusState(int status) { + this.orderStatusEnum = OrderStatusEnum.getJobStatusEnum(status); + } + + /** + * 构造函数,当前状态枚举 + * @param requestStatusEnum + */ + public OrderStatusState(OrderStatusEnum requestStatusEnum) { + this.orderStatusEnum = requestStatusEnum; + } + + /** + * 发布 + * @return + */ + public boolean publish() { + if(this.orderStatusEnum.getCode() == OrderStatusEnum.READY.getCode()) { + this.orderStatusEnum = OrderStatusEnum.PUBLISHED; + return Boolean.TRUE; + } else { + return Boolean.FALSE; + } + } + + /** + * 下架 + * @return + */ + public boolean withdraw() { + if(this.orderStatusEnum.getCode() == OrderStatusEnum.PUBLISHED.getCode()) { + this.orderStatusEnum = OrderStatusEnum.READY; + return Boolean.TRUE; + } else { + return Boolean.FALSE; + } + } + + /** + * 关闭 + * @return + */ + public boolean close() { + if(this.orderStatusEnum.getCode() == OrderStatusEnum.READY.getCode()) { + this.orderStatusEnum = OrderStatusEnum.CLOSED; + return Boolean.TRUE; + } else { + return Boolean.FALSE; + } + } + + /** + * 打开 + * @return + */ + public boolean open() { + if(this.orderStatusEnum.getCode() == OrderStatusEnum.CLOSED.getCode()) { + this.orderStatusEnum = OrderStatusEnum.READY; + return Boolean.TRUE; + } else { + return Boolean.FALSE; + } + } + + /** + * 获取可执行的状态机 + * @return + */ + public OrderStatusEnum getState() { + return orderStatusEnum; + } + +} 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 new file mode 100644 index 00000000..d8439966 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/plan/PlanStatusEnum.java @@ -0,0 +1,36 @@ +package com.win.module.wms.enums.plan; + +public enum PlanStatusEnum { + + NEW(0), // 新增 + REVIEWING(1), // 审批中 + AGREED(2), // 审批通过 + REFUSED(3), // 审批驳回 + CLOSED(4), // 关闭 + PUBLISHED(5), // 发布 + COMPLETED(6), // 已完成 + ; + private final Integer code; + + PlanStatusEnum(int code) { + this.code = code; + } + + public int getCode() { + return code; + } + + /** + * 用状态值获取枚举 + * @param status + * @return + */ + static PlanStatusEnum getJobStatusEnum(int status) { + for (PlanStatusEnum jobStatusEnum : values()) { + if (jobStatusEnum.getCode() == status) { + return jobStatusEnum; + } + } + return NEW; + } +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/plan/PlanStatusState.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/plan/PlanStatusState.java new file mode 100644 index 00000000..f24926b6 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/plan/PlanStatusState.java @@ -0,0 +1,122 @@ +package com.win.module.wms.enums.plan; + +/** + * 订单状态机 + */ +public class PlanStatusState { + + /** + * 当前状态枚举 + */ + private PlanStatusEnum orderStatusEnum; + + /** + * 构造函数,默认创建 + */ + public PlanStatusState() { + this.orderStatusEnum = PlanStatusEnum.NEW; + } + + /** + * 构造函数,当前状态 + * @param status + */ + public PlanStatusState(int status) { + this.orderStatusEnum = PlanStatusEnum.getJobStatusEnum(status); + } + + /** + * 构造函数,当前状态枚举 + * @param requestStatusEnum + */ + public PlanStatusState(PlanStatusEnum requestStatusEnum) { + this.orderStatusEnum = requestStatusEnum; + } + + /** + * 提交 + * @return + */ + public boolean submit() { + if(this.orderStatusEnum.getCode() == PlanStatusEnum.NEW.getCode()) { + this.orderStatusEnum = PlanStatusEnum.REVIEWING; + return Boolean.TRUE; + } else { + return Boolean.FALSE; + } + } + + /** + * 审批驳回 + * @return + */ + public boolean reject() { + if(this.orderStatusEnum.getCode() == PlanStatusEnum.REVIEWING.getCode()) { + this.orderStatusEnum = PlanStatusEnum.REFUSED; + return Boolean.TRUE; + } else { + return Boolean.FALSE; + } + } + + /** + * 审批通过 + * @return + */ + public boolean agree() { + if(this.orderStatusEnum.getCode() == PlanStatusEnum.REVIEWING.getCode()) { + this.orderStatusEnum = PlanStatusEnum.AGREED; + return Boolean.TRUE; + } else { + return Boolean.FALSE; + } + } + + /** + * 关闭 + * @return + */ + public boolean close() { + if(this.orderStatusEnum.getCode() == PlanStatusEnum.NEW.getCode() || this.orderStatusEnum.getCode() == PlanStatusEnum.REVIEWING.getCode() || this.orderStatusEnum.getCode() == PlanStatusEnum.AGREED.getCode() || this.orderStatusEnum.getCode() == PlanStatusEnum.PUBLISHED.getCode()) { + this.orderStatusEnum = PlanStatusEnum.CLOSED; + return Boolean.TRUE; + } else { + return Boolean.FALSE; + } + } + + /** + * 审批通过 + * @return + */ + public boolean resetting() { + if(this.orderStatusEnum.getCode() == PlanStatusEnum.REFUSED.getCode()) { + this.orderStatusEnum = PlanStatusEnum.NEW; + return Boolean.TRUE; + } else { + return Boolean.FALSE; + } + } + + /** + * 执行 + * @return + */ + public boolean execute() { + if(this.orderStatusEnum.getCode() == PlanStatusEnum.PUBLISHED.getCode()) { + this.orderStatusEnum = PlanStatusEnum.COMPLETED; + return Boolean.TRUE; + } else { + return Boolean.FALSE; + } + } + + /** + * 获取可执行的状态机 + * @return + */ + public PlanStatusEnum getState() { + return orderStatusEnum; + } + +} 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 e1c24291..9030789a 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 @@ -3,14 +3,14 @@ package com.win.module.wms.enums.request; public enum RequestStatusEnum { NEW(0), // 新增 - APPROVAL(1), // 审批中 - PASS(2), // 审批通过 - REJECT(3), // 审批驳回 + REVIEWING(1), // 审批中 + AGREED(2), // 审批通过 + REFUSED(3), // 审批驳回 CLOSED(4), // 关闭 - PROCESSING(5), // 处理中 - PARTIALLY_COMPLETED(6), // 部分完成 + HANDLING(5), // 处理中 + PARTIAL(6), // 部分完成 COMPLETED(7), // 已完成 - TERMINATION(8), // 中止 + ABORT(8), // 中止 ; private final Integer code; @@ -27,7 +27,7 @@ public enum RequestStatusEnum { * @param status * @return */ - static RequestStatusEnum getJobStatusEnum(int status) { + static RequestStatusEnum getRequestStatusEnum(int status) { for (RequestStatusEnum jobStatusEnum : values()) { if (jobStatusEnum.getCode() == status) { return jobStatusEnum; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/request/RequestStatusState.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/request/RequestStatusState.java index f8a9d992..9c1180c4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/request/RequestStatusState.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/request/RequestStatusState.java @@ -24,7 +24,7 @@ public class RequestStatusState { * @param status */ public RequestStatusState(int status) { - this.requestStatusEnum = RequestStatusEnum.getJobStatusEnum(status); + this.requestStatusEnum = RequestStatusEnum.getRequestStatusEnum(status); } /** @@ -41,11 +41,11 @@ public class RequestStatusState { */ public boolean newObject(RequestsettingDO requestsettingDO) { if("TRUE".equals(requestsettingDO.getAutoCommit())) { - this.requestStatusEnum = RequestStatusEnum.APPROVAL; + this.requestStatusEnum = RequestStatusEnum.REVIEWING; if("TRUE".equals(requestsettingDO.getAutoAgree())) { - this.requestStatusEnum = RequestStatusEnum.PASS; + this.requestStatusEnum = RequestStatusEnum.AGREED; if("TRUE".equals(requestsettingDO.getAutoExecute())) { - this.requestStatusEnum = RequestStatusEnum.PROCESSING; + this.requestStatusEnum = RequestStatusEnum.HANDLING; } } } @@ -58,11 +58,11 @@ public class RequestStatusState { */ public boolean submit(RequestsettingDO requestsettingDO) { if(this.requestStatusEnum.getCode() == RequestStatusEnum.NEW.getCode()) { - this.requestStatusEnum = RequestStatusEnum.APPROVAL; + this.requestStatusEnum = RequestStatusEnum.REVIEWING; if("TRUE".equals(requestsettingDO.getAutoAgree())) { - this.requestStatusEnum = RequestStatusEnum.PASS; + this.requestStatusEnum = RequestStatusEnum.AGREED; if("TRUE".equals(requestsettingDO.getAutoExecute())) { - this.requestStatusEnum = RequestStatusEnum.PROCESSING; + this.requestStatusEnum = RequestStatusEnum.HANDLING; } } return Boolean.TRUE; @@ -76,10 +76,10 @@ public class RequestStatusState { * @return */ public boolean approval(RequestsettingDO requestsettingDO) { - if(this.requestStatusEnum.getCode() == RequestStatusEnum.APPROVAL.getCode()) { - this.requestStatusEnum = RequestStatusEnum.PASS; + if(this.requestStatusEnum.getCode() == RequestStatusEnum.REVIEWING.getCode()) { + this.requestStatusEnum = RequestStatusEnum.AGREED; if("TRUE".equals(requestsettingDO.getAutoExecute())) { - this.requestStatusEnum = RequestStatusEnum.PROCESSING; + this.requestStatusEnum = RequestStatusEnum.HANDLING; } return Boolean.TRUE; } else { @@ -92,8 +92,8 @@ public class RequestStatusState { * @return */ public boolean reject() { - if(this.requestStatusEnum.getCode() == RequestStatusEnum.APPROVAL.getCode()) { - this.requestStatusEnum = RequestStatusEnum.PASS; + if(this.requestStatusEnum.getCode() == RequestStatusEnum.REVIEWING.getCode()) { + this.requestStatusEnum = RequestStatusEnum.AGREED; return Boolean.TRUE; } else { return Boolean.FALSE; @@ -104,9 +104,9 @@ public class RequestStatusState { * 关闭,其余操作在任务中执行 * @return */ - public boolean closed() { - if(this.requestStatusEnum.getCode() == RequestStatusEnum.NEW.getCode() || this.requestStatusEnum.getCode() == RequestStatusEnum.APPROVAL.getCode() || this.requestStatusEnum.getCode() == RequestStatusEnum.PASS.getCode()) { - this.requestStatusEnum = RequestStatusEnum.PASS; + public boolean close() { + if(this.requestStatusEnum.getCode() == RequestStatusEnum.NEW.getCode() || this.requestStatusEnum.getCode() == RequestStatusEnum.REVIEWING.getCode() || this.requestStatusEnum.getCode() == RequestStatusEnum.AGREED.getCode()) { + this.requestStatusEnum = RequestStatusEnum.AGREED; return Boolean.TRUE; } else { return Boolean.FALSE;