From 5413dcdaa59baa02d3d3b58ca399bd767d006d2c Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Thu, 16 Nov 2023 19:39:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../win/module/wms/enums/request/RequestStatusState.java | 6 +++--- .../inspectRequest/InspectRequestMainServiceImpl.java | 2 +- .../PurchasereceiptRequestMainServiceImpl.java | 4 ++-- .../putawayRequest/PutawayRequestMainServiceImpl.java | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) 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 da783e16..f2a67061 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 @@ -109,9 +109,9 @@ public class RequestStatusState { * 驳回 * @return */ - public boolean reject() { + public boolean refused() { if(this.requestStatusEnum.getCode().equals(RequestStatusEnum.REVIEWING.getCode())) { - this.requestStatusEnum = RequestStatusEnum.AGREED; + this.requestStatusEnum = RequestStatusEnum.REFUSED; return Boolean.TRUE; } else { return Boolean.FALSE; @@ -124,7 +124,7 @@ public class RequestStatusState { */ public boolean close() { if(this.requestStatusEnum.getCode().equals(RequestStatusEnum.NEW.getCode()) || this.requestStatusEnum.getCode().equals(RequestStatusEnum.REVIEWING.getCode()) || this.requestStatusEnum.getCode().equals(RequestStatusEnum.AGREED.getCode())) { - this.requestStatusEnum = RequestStatusEnum.AGREED; + this.requestStatusEnum = RequestStatusEnum.CLOSED; return Boolean.TRUE; } else { return Boolean.FALSE; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java index 8ec2efdc..15ceeec1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java @@ -331,7 +331,7 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService // 校验存在 InspectRequestMainDO mainDO = validateInspectRequestMainExists(id); RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); - boolean flag = requestStatusState.reject(); + boolean flag = requestStatusState.refused(); if(!flag) { throw new ServiceException(INSPECT_REQUEST_CANNOT_ABORT); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java index bcbb2d7f..36cadf76 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java @@ -154,7 +154,7 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq public Integer updatePurchasereceiptRequestMain(PurchasereceiptRequestMainUpdateReqVO updateReqVO) { // 校验存在 PurchasereceiptRequestMainDO existPurchasereceiptRequestMainDO = validatePurchasereceiptRequestMainExists(updateReqVO.getId()); - if(existPurchasereceiptRequestMainDO.getStatus().equals(RequestStatusEnum.NEW.getCode())) { + if(!existPurchasereceiptRequestMainDO.getStatus().equals(RequestStatusEnum.NEW.getCode())) { throw exception(PURCHASERECEIPT_REQUEST_STATUS_NOT_NEW); } //增加操作记录 @@ -378,7 +378,7 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq // 校验存在 PurchasereceiptRequestMainDO mainDO = validatePurchasereceiptRequestMainExists(id); RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); - boolean flag = requestStatusState.reject(); + boolean flag = requestStatusState.refused(); if(!flag) { throw new ServiceException(PURCHASERECEIPT_REQUEST_CANNOT_ABORT); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java index 230107a8..d1dbc96f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java @@ -296,7 +296,7 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService // 校验存在 PutawayRequestMainDO mainDO = validatePutawayRequestMainExists(id); RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); - boolean flag = requestStatusState.reject(); + boolean flag = requestStatusState.refused(); if(!flag) { throw new ServiceException(PUTAWAY_REQUEST_CANNOT_ABORT); }