Browse Source

修改状态方法。

master
刘忱 2 years ago
parent
commit
5413dcdaa5
  1. 6
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/enums/request/RequestStatusState.java
  2. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java
  3. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java
  4. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java

6
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;

2
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);
}

4
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);
}

2
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);
}

Loading…
Cancel
Save