From cc5b3665bd92ce125b3b14a91634e32f005ab7a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Thu, 16 Nov 2023 11:06:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=8A=B6=E6=80=81=E6=9C=BA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/wms/enums/ErrorCodeConstants.java | 14 ++++++++- .../wms/enums/plan/PlanStatusState.java | 30 +++++++++++++++++-- 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java index a23cd5f5..c644ecbb 100644 --- a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java +++ b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java @@ -47,6 +47,7 @@ public interface ErrorCodeConstants { ErrorCode BOM_COMPONENT_QTY_EXISTS = new ErrorCode(1_000_022_006, "子物料数量不存在"); ErrorCode BOM_PROCESS_CODE_NOT_EXISTS = new ErrorCode(1_000_022_007, "工序代码不存在"); ErrorCode BOM_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_022_008, "导入物联清单不能为空"); + ErrorCode BOM_ITEM_VERSION_QTY_EXISTS = new ErrorCode(1_000_022_009, "父物料与bom版本无关系"); //标准成本价格单ErrorCode ErrorCode STDCOSTPRICE_NOT_EXISTS = new ErrorCode(1_023_000_000, "标准成本价格单不存在"); ErrorCode STDCOSTPRICE_SUPPLIER_CODE_NOT_EXISTS = new ErrorCode(1_023_000_001, "供应商代码不存在"); @@ -581,15 +582,26 @@ public interface ErrorCodeConstants { ErrorCode WORK_MAIN_NOT_EXISTS = new ErrorCode(1_000_100_000, "生产订单主不存在"); //生产订单子ErrorCode ErrorCode WORK_DETAIL_NOT_EXISTS = new ErrorCode(1_000_100_001, "生产订单子不存在"); + //生产订单主ErrorCode ErrorCode PRODUCTION_MAIN_NOT_EXISTS = new ErrorCode(1_001_101_000, "生产计划主不存在"); - //生产计划子ErrorCode ErrorCode PRODUCTION_DETAIL_NOT_EXISTS = new ErrorCode(1_001_101_001, "生产计划子不存在"); ErrorCode PRODUCTION_MAIN_MASSAGE_EXISTS = new ErrorCode(1_001_101_002, "生产计明细:订单号、零件号无效"); ErrorCode PRODUCTION_MAIN_NUMBER_CLOSE_EXISTS = new ErrorCode(1_001_101_003, "生产计划number已经关闭"); ErrorCode PRODUCTION_MAIN_NUMBER_NOT_EXISTS = new ErrorCode(1_001_101_004, "生产计划number无效"); ErrorCode PRODUCTION_DETAIL_VOID_STATUS_ERROR = new ErrorCode(1_001_101_005, "生产计划明细无效,状态错误"); + ErrorCode PRODUCTION_MAIN_PREPARETOISSUE_EXISTS = new ErrorCode(1_001_101_006, "生产计划存在备料计划单"); + ErrorCode PRODUCTION_MAIN_PRODUCTRECEIPT_EXISTS = new ErrorCode(1_001_101_007, "生产计划存在制品收货申请单"); + + ErrorCode PRODUCTION_MAIN_CANNOT_CLOSE = new ErrorCode(1_001_101_008, "生产计划状态不支持关闭"); + ErrorCode PRODUCTION_MAIN_CANNOT_SUBMIT = new ErrorCode(1_001_101_009, "生产计划状态不支持提交"); + ErrorCode PRODUCTION_MAIN_CANNOT_OPEN = new ErrorCode(1_001_101_010, "生产计划状态不支持打开"); + ErrorCode PRODUCTION_MAIN_CANNOT_REJECT = new ErrorCode(1_001_101_011, "生产计划状态不支持驳回"); + ErrorCode PRODUCTION_MAIN_CANNOT_AGREE = new ErrorCode(1_001_101_012, "生产计划状态不支持审批通过"); + ErrorCode PRODUCTION_MAIN_CANNOT_PUBLISH = new ErrorCode(1_001_101_013, "生产计划状态不支持发布"); + ErrorCode PRODUCTION_MAIN_CANNOT_RESETTING = new ErrorCode(1_001_101_014, "生产计划状态不支持重置"); + //制品收货申请主ErrorCode ErrorCode PRODUCTRECEIPT_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_102_000, "制品收货申请主不存在"); 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 index e37b158e..33307034 100644 --- 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 @@ -77,7 +77,7 @@ public class PlanStatusState { * @return */ public boolean close() { - if(this.planStatusEnum.getCode().equals(PlanStatusEnum.NEW.getCode()) || this.planStatusEnum.getCode().equals(PlanStatusEnum.REVIEWING.getCode()) || this.planStatusEnum.getCode().equals(PlanStatusEnum.AGREED.getCode()) || this.planStatusEnum.getCode().equals(PlanStatusEnum.PUBLISHED.getCode())) { + if(this.planStatusEnum.getCode().equals(PlanStatusEnum.NEW.getCode()) || this.planStatusEnum.getCode().equals(PlanStatusEnum.REVIEWING.getCode()) || this.planStatusEnum.getCode().equals(PlanStatusEnum.AGREED.getCode()) || this.planStatusEnum.getCode().equals(PlanStatusEnum.PUBLISHED.getCode()) || this.planStatusEnum.getCode().equals(PlanStatusEnum.REFUSED.getCode())) { this.planStatusEnum = PlanStatusEnum.CLOSED; return Boolean.TRUE; } else { @@ -86,7 +86,20 @@ public class PlanStatusState { } /** - * 审批通过 + * 打开 + * @return + */ + public boolean open() { + if(this.planStatusEnum.getCode().equals(PlanStatusEnum.CLOSED.getCode())) { + this.planStatusEnum = PlanStatusEnum.NEW; + return Boolean.TRUE; + } else { + return Boolean.FALSE; + } + } + + /** + * 重置 * @return */ public boolean resetting() { @@ -98,6 +111,19 @@ public class PlanStatusState { } } + /** + * 发布 + * @return + */ + public boolean publish() { + if(this.planStatusEnum.getCode().equals(PlanStatusEnum.AGREED.getCode())) { + this.planStatusEnum = PlanStatusEnum.PUBLISHED; + return Boolean.TRUE; + } else { + return Boolean.FALSE; + } + } + /** * 执行 * @return