ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.抛出异常类型修改为业务异常，2.关闭验证码

This commit is contained in:
wangcl 2021-12-27 10:59:54 +08:00
parent 6e858b5724
commit ddf707460a
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiMaterialOperateController.java
View File

@ -2,6 +2,7 @@ package com.ruoyi.busi.controller;
import java.util.List;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
@ -86,7 +87,7 @@ public class BusiMaterialOperateController extends BaseController
@Log(title = "物料操作流水", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ResponseBody
public AjaxResult addSave(BusiMaterialOperate busiMaterialOperate) throws Exception {
public AjaxResult addSave(BusiMaterialOperate busiMaterialOperate) throws ServiceException {
busiMaterialOperate.setCreateBy(getLoginName());
busiMaterialOperate.setCreateTime(DateUtils.getNowDate());

3
ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiMaterialOperateService.java
View File

@ -2,6 +2,7 @@ package com.ruoyi.busi.service;
import java.util.List;
import com.ruoyi.busi.domain.BusiMaterialOperate;
import com.ruoyi.common.exception.ServiceException;
/**
* 物料操作流水Service接口
@ -33,7 +34,7 @@ public interface IBusiMaterialOperateService
* @param busiMaterialOperate 物料操作流水
* @return 结果
*/
public int insertBusiMaterialOperate(BusiMaterialOperate busiMaterialOperate) throws Exception;
public int insertBusiMaterialOperate(BusiMaterialOperate busiMaterialOperate) throws ServiceException;
/**
* 修改物料操作流水

8
ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiMaterialOperateServiceImpl.java
View File

@ -5,7 +5,7 @@ import java.util.List;
import com.ruoyi.busi.domain.BusiMaterialStock;
import com.ruoyi.busi.mapper.BusiMaterialStockMapper;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.exception.ServiceException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.busi.mapper.BusiMaterialOperateMapper;
@ -58,7 +58,7 @@ public class BusiMaterialOperateServiceImpl implements IBusiMaterialOperateServi
*/
@Override
@Transactional(rollbackFor = Exception.class)
public int insertBusiMaterialOperate(BusiMaterialOperate busiMaterialOperate) throws Exception {
public int insertBusiMaterialOperate(BusiMaterialOperate busiMaterialOperate) throws ServiceException {
// 先查询库存
List<BusiMaterialStock> busiMaterialStocks = queryBusiMaterialStocks(busiMaterialOperate);
BusiMaterialStock busiMaterialStock;
@ -70,7 +70,7 @@ public class BusiMaterialOperateServiceImpl implements IBusiMaterialOperateServi
} else {// 2为入库
long stockAmount = busiMaterialStock.getAmountIn() - busiMaterialStock.getAmountOut();
if(busiMaterialOperate.getAmount() > stockAmount){
throw new Exception("出库超过库存");
throw new ServiceException("出库超过库存");
}
busiMaterialStock.setAmountOut(busiMaterialOperate.getAmount() + busiMaterialStock.getAmountOut());
}
@ -87,7 +87,7 @@ public class BusiMaterialOperateServiceImpl implements IBusiMaterialOperateServi
if ("1".equals(busiMaterialOperate.getOprateType())) {
busiMaterialStock.setAmountIn(busiMaterialOperate.getAmount());
} else {
throw new Exception("尚未建立库存，请先入库再出库");
throw new ServiceException("尚未建立库存，请先入库再出库");
}
busiMaterialStockMapper.insertBusiMaterialStock(busiMaterialStock);
}

2
ruoyi-admin/src/main/resources/application.yml
View File

@ -95,7 +95,7 @@ shiro:
# 首页地址
indexUrl: /index
# 验证码开关
captchaEnabled: true
captchaEnabled: false
# 验证码类型 math 数组计算 char 字符
captchaType: math
cookie: