From a30ccb9d58b2ae3c61f18cce9b178f629f3ce893 Mon Sep 17 00:00:00 2001 From: xd <844539747@qq.com> Date: Wed, 22 May 2024 10:49:17 +0800 Subject: [PATCH] '123' --- .../com/ruoyi/web/controller/quot/QuotController.java | 6 +++--- .../ruoyi/web/controller/redBook/RedBookController.java | 8 ++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java index 5de8281..7b2d8cb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java @@ -160,9 +160,9 @@ public class QuotController extends BaseController for(String quotId:quotIds){ Quot quot = quotService.selectQuotByQuotId(quotId); if("1".equals(quot.getQuotApprovalStatus())){ - return error("报价单:"+quot.getQuotCode()+" 已提交报价，无法删除"); + return error("报价单:"+quot.getQuotCode()+" 已提交，无法删除"); }else if("2".equals(quot.getQuotApprovalStatus())){ - return error("报价单:"+quot.getQuotCode()+" 已完成报价，无法删除"); + return error("报价单:"+quot.getQuotCode()+" 已完成，无法删除"); }else if("3".equals(quot.getQuotApprovalStatus())){ return error("报价单:"+quot.getQuotCode()+" 已被驳回，无法删除"); } @@ -276,7 +276,7 @@ public class QuotController extends BaseController LoginUser loginUser = getLoginUser();//当前登陆者 //获取发送人-报价组 List userIds = noticeService.getSendEmp(WebsocketConst.MSG_SEND_QUOT_BJZ); - NoticeUtil.sendNoticesBusiness(loginUser,"有报价单信息待审核","单号:"+quot.getQuotCode(),userIds); + NoticeUtil.sendNoticesBusiness(loginUser,"有询价单信息待审核","单号:"+quot.getQuotCode(),userIds); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/redBook/RedBookController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/redBook/RedBookController.java index f299916..1cfa631 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/redBook/RedBookController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/redBook/RedBookController.java @@ -340,6 +340,14 @@ public class RedBookController extends BaseController @DeleteMapping("/deleteQuots/{quotId}") public AjaxResult remove(@PathVariable String quotId) { + OAQuot oaQuot = redBookService.selectQuotByQuotId(quotId); + if("1".equals(oaQuot.getQuotApprovalStatus())){ + return error("报价单:"+oaQuot.getQuotCode()+" 已提交，无法删除"); + }else if("2".equals(oaQuot.getQuotApprovalStatus())){ + return error("报价单:"+oaQuot.getQuotCode()+" 已完成，无法删除"); + }else if("3".equals(oaQuot.getQuotApprovalStatus())){ + return error("报价单:"+oaQuot.getQuotCode()+" 已被驳回，无法删除"); + } return toAjax(redBookService.deleteQuotsByQuotId(quotId)); } }