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 bb4e44fd..d6b2afb8 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 @@ -446,6 +446,14 @@ public interface ErrorCodeConstants { ErrorCode PURCHASERETURN_REQUEST_DETAIL_NOT_EXISTS = new ErrorCode(1_000_075_001, "采购退货申请子不存在"); ErrorCode PURCHASERETURN_REQUEST_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_075_002, "采购退货申请导入数据不能为空"); + ErrorCode PURCHASERETURN_REQUEST_STATUS_NOT_NEW = new ErrorCode(1_000_075_003, "采购退货不是新增状态"); + ErrorCode PURCHASERETURN_REQUEST_JOB_EXISTS = new ErrorCode(1_000_075_004, "采购退货存在采购退货任务单"); + ErrorCode PURCHASERETURN_REQUEST_CANNOT_CLOSE = new ErrorCode(1_000_075_005, "采购退货状态不支持关闭"); + ErrorCode PURCHASERETURN_REQUEST_CANNOT_SUBMIT = new ErrorCode(1_000_075_006, "采购退货状态不支持提交"); + ErrorCode PURCHASERETURN_REQUEST_CANNOT_AGREE = new ErrorCode(1_000_075_007, "采购退货状态不支持审批同意"); + ErrorCode PURCHASERETURN_REQUEST_CANNOT_HANDLE = new ErrorCode(1_000_075_008, "采购退货状态不支持处理"); + ErrorCode PURCHASERETURN_REQUEST_CANNOT_ABORT = new ErrorCode(1_000_075_009, "采购退货状态不支持审批拒绝"); + ErrorCode PURCHASERETURN_REQUEST_CANNOT_RE_ADD = new ErrorCode(1_000_075_010, "采购退货状态不支持重新添加"); //采购退货任务主ErrorCode ErrorCode PURCHASERETURN_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_076_000, "采购退货任务主不存在"); //采购退货任务子ErrorCode diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java index fa53628a..fe1b7c05 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java @@ -232,12 +232,12 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque PurchasereturnRequestMainDO mainDO = validatePurchasereturnRequestMainExists(id); Long count = purchasereturnJobMainMapper.selectByRequestNumber(mainDO.getNumber()); if(count > 0) { - throw new ServiceException(PURCHASERECEIPT_REQUEST_JOB_EXISTS); + throw new ServiceException(PURCHASERETURN_REQUEST_JOB_EXISTS); } RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); boolean flag = requestStatusState.close(); if(!flag) { - throw new ServiceException(PURCHASERECEIPT_REQUEST_CANNOT_CLOSE); + throw new ServiceException(PURCHASERETURN_REQUEST_CANNOT_CLOSE); } mainDO.setStatus(requestStatusState.getState().getCode());//增加操作记录 trendsApi.createTrends(id, "purchasereturnRequest", "关闭了采购收货申请", TrendsTypeEnum.UPDATE); @@ -251,12 +251,12 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque PurchasereturnRequestMainDO mainDO = validatePurchasereturnRequestMainExists(id); Long count = purchasereturnJobMainMapper.selectByRequestNumber(mainDO.getNumber()); if(count > 0) { - throw new ServiceException(PURCHASERECEIPT_REQUEST_JOB_EXISTS); + throw new ServiceException(PURCHASERETURN_REQUEST_JOB_EXISTS); } RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); boolean flag = requestStatusState.reAdd(); if(!flag) { - throw new ServiceException(PURCHASERECEIPT_REQUEST_CANNOT_RE_ADD); + throw new ServiceException(PURCHASERETURN_REQUEST_CANNOT_RE_ADD); } mainDO.setStatus(requestStatusState.getState().getCode());//增加操作记录 trendsApi.createTrends(id, "purchasereturnRequest", "打开了采购收货申请", TrendsTypeEnum.UPDATE); @@ -270,7 +270,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); boolean flag = requestStatusState.submit(mainDO.getAutoAgree(), mainDO.getAutoExecute()); if(!flag) { - throw new ServiceException(PURCHASERECEIPT_REQUEST_CANNOT_SUBMIT); + throw new ServiceException(PURCHASERETURN_REQUEST_CANNOT_SUBMIT); } mainDO.setStatus(requestStatusState.getState().getCode()); //调用自动执行方法 @@ -289,7 +289,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); boolean flag = requestStatusState.agree(mainDO.getAutoExecute()); if(!flag) { - throw new ServiceException(PURCHASERECEIPT_REQUEST_CANNOT_AGREE); + throw new ServiceException(PURCHASERETURN_REQUEST_CANNOT_AGREE); } mainDO.setStatus(requestStatusState.getState().getCode()); //调用自动执行方法 @@ -308,7 +308,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); boolean flag = requestStatusState.handle(); if(!flag) { - throw new ServiceException(PURCHASERECEIPT_REQUEST_CANNOT_HANDLE); + throw new ServiceException(PURCHASERETURN_REQUEST_CANNOT_HANDLE); } mainDO.setStatus(requestStatusState.getState().getCode()); //调用执行方法 @@ -325,7 +325,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); boolean flag = requestStatusState.refused(); if(!flag) { - throw new ServiceException(PURCHASERECEIPT_REQUEST_CANNOT_ABORT); + throw new ServiceException(PURCHASERETURN_REQUEST_CANNOT_ABORT); } mainDO.setStatus(requestStatusState.getState().getCode()); trendsApi.createTrends(id, "purchasereturnRequest", "审批拒绝了采购收货申请", TrendsTypeEnum.UPDATE);