20220505

xiaoyong931011

2022-05-05 03f20f2541342349fbabf6a59e7e450f50ba3e61

 zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java

@@ -556,6 +556,11 @@
                    && !checkProjServices.getState().equals(Dictionary.SERVICE_STATU_DQR)) {
                return new AjaxResult(AjaxResult.STATUS_FAIL, "您只能取消待预约订单");
            }
        }else{
            if (checkProjServices.getState().equals(Dictionary.SERVICE_STATU_FWWC)
                    || checkProjServices.getState().equals(Dictionary.SERVICE_STATU_FFJS)) {
                return new AjaxResult(AjaxResult.STATUS_FAIL, "当前状态无法取消订单");
            }
        }
        return erpCancelOrder(services);
    }