feat(库存): 库存列表与库存报表支持按采购订单号过滤

gaoluyang

8 天以前 befe7f238921f08091ba22f8a6c067e9aced28ba

 src/main/java/com/ruoyi/framework/aspectj/LogAspect.java

@@ -2,8 +2,8 @@


import java.util.Collection;

import java.util.Map;

import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpServletResponse;

import jakarta.servlet.http.HttpServletRequest;

import jakarta.servlet.http.HttpServletResponse;

import org.apache.commons.lang3.ArrayUtils;

import org.aspectj.lang.JoinPoint;

import org.aspectj.lang.annotation.AfterReturning;

@@ -17,8 +17,10 @@
import org.springframework.validation.BindingResult;

import org.springframework.web.multipart.MultipartFile;

import com.alibaba.fastjson2.JSON;

import com.ruoyi.common.core.text.Convert;

import com.ruoyi.common.enums.HttpMethod;

import com.ruoyi.common.filter.PropertyPreExcludeFilter;

import com.ruoyi.common.utils.ExceptionUtil;

import com.ruoyi.common.utils.SecurityUtils;

import com.ruoyi.common.utils.ServletUtils;

import com.ruoyi.common.utils.StringUtils;

@@ -96,8 +98,10 @@
            operLog.setOperUrl(StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255));

            if (loginUser != null)

            {

                operLog.setOperName(loginUser.getUsername());

                SysUser currentUser = loginUser.getUser();

                // 操作人员记录昵称，昵称为空时回退登录账号

                operLog.setOperName(StringUtils.isNotNull(currentUser) && StringUtils.isNotEmpty(currentUser.getNickName())

                        ? currentUser.getNickName() : loginUser.getUsername());

                if (StringUtils.isNotNull(currentUser) && StringUtils.isNotNull(currentUser.getDept()))

                {

                    operLog.setDeptName(currentUser.getDept().getDeptName());

@@ -107,7 +111,7 @@
            if (e != null)

            {

                operLog.setStatus(BusinessStatus.FAIL.ordinal());

                operLog.setErrorMsg(StringUtils.substring(e.getMessage(), 0, 2000));

                operLog.setErrorMsg(StringUtils.substring(Convert.toStr(e.getMessage(), ExceptionUtil.getExceptionMessage(e)), 0, 2000));

            }

            // 设置方法名称

            String className = joinPoint.getTarget().getClass().getName();