xd
/
JNBusiness
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'123'

This commit is contained in:
xd 2024-05-22 10:49:17 +08:00
parent ecfa045563
commit a30ccb9d58
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java
View File

@ -160,9 +160,9 @@ public class QuotController extends BaseController
for(String quotId:quotIds){ for(String quotId:quotIds){
Quot quot = quotService.selectQuotByQuotId(quotId); Quot quot = quotService.selectQuotByQuotId(quotId);
if("1".equals(quot.getQuotApprovalStatus())){ if("1".equals(quot.getQuotApprovalStatus())){
return error("报价单:"+quot.getQuotCode()+" 已提交报价，无法删除"); return error("报价单:"+quot.getQuotCode()+" 已提交，无法删除");
}else if("2".equals(quot.getQuotApprovalStatus())){ }else if("2".equals(quot.getQuotApprovalStatus())){
return error("报价单:"+quot.getQuotCode()+" 已完成报价，无法删除"); return error("报价单:"+quot.getQuotCode()+" 已完成，无法删除");
}else if("3".equals(quot.getQuotApprovalStatus())){ }else if("3".equals(quot.getQuotApprovalStatus())){
return error("报价单:"+quot.getQuotCode()+" 已被驳回，无法删除"); return error("报价单:"+quot.getQuotCode()+" 已被驳回，无法删除");
} }
@ -276,7 +276,7 @@ public class QuotController extends BaseController
LoginUser loginUser = getLoginUser();//当前登陆者 LoginUser loginUser = getLoginUser();//当前登陆者
//获取发送人-报价组 //获取发送人-报价组
List<String> userIds = noticeService.getSendEmp(WebsocketConst.MSG_SEND_QUOT_BJZ); List<String> userIds = noticeService.getSendEmp(WebsocketConst.MSG_SEND_QUOT_BJZ);
NoticeUtil.sendNoticesBusiness(loginUser,"有报价单信息待审核","单号:"+quot.getQuotCode(),userIds); NoticeUtil.sendNoticesBusiness(loginUser,"有询价单信息待审核","单号:"+quot.getQuotCode(),userIds);
} }
/** /**

8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/redBook/RedBookController.java
View File

@ -340,6 +340,14 @@ public class RedBookController extends BaseController
@DeleteMapping("/deleteQuots/{quotId}") @DeleteMapping("/deleteQuots/{quotId}")
public AjaxResult remove(@PathVariable String 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)); return toAjax(redBookService.deleteQuotsByQuotId(quotId));
} }
} }