# 529

whycq

2024-05-29 760f94f5aa0a8777ac1fd2351766882f4ff1049f

# 529

 src/main/java/com/zy/asrs/task/AutoMoveScheduler.java

@@ -51,6 +51,7 @@
                .eq("wrk_sts", 22)
                .andNew().eq("io_type",108)
                        .eq("crn_no",2)
                        .orderBy("appe_time",true)
                );
        if (agvWrkMastList.isEmpty()) {
            return;
@@ -67,6 +68,7 @@
                .eq("wrk_sts", 22)
                .andNew().eq("io_type",108)
                .eq("crn_no",3)
                .orderBy("appe_time",true)
        );
        if (agvWrkMastList.isEmpty()) {
            return;

 src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java

@@ -120,7 +120,7 @@
                agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue(),"",(short)0);
                // 新建工作档
                Date now = new Date();
                createWrkMast(109, 201L, agvWrkMast.getLocNo(), "", agvWrkMast.getBarcode(), now, 9527L, agvWrkMast.getWhsType(), 0);
//                createWrkMast(109, 201L, agvWrkMast.getLocNo(), "", agvWrkMast.getBarcode(), now, 9527L, agvWrkMast.getWhsType(), 0);
            }
        }
        if (agvWrkMast.getIoType() == 58) {

 src/main/java/com/zy/common/config/AdminInterceptor.java

@@ -14,16 +14,13 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.lang.Nullable;
import org.springframework.stereotype.Component;
import org.springframework.util.StreamUtils;
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;

import javax.servlet.ServletInputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.lang.reflect.Method;
import java.nio.charset.Charset;
import java.util.Date;

/**
@@ -140,15 +137,12 @@
                    Http.response(response, BaseRes.NO_ACTIVATION);
                    return false;
                }
                ServletInputStream inputStream = request.getInputStream();
                String bodyParam = StreamUtils.copyToString(inputStream, Charset.defaultCharset());

                // 记录操作日志
                OperateLog operateLog = new OperateLog();
                operateLog.setAction(Cools.isEmpty(memo)?request.getRequestURI():memo);
                operateLog.setIp(request.getRemoteAddr());
                operateLog.setUserId(user.getId());
                operateLog.setRequest(JSON.toJSONString(bodyParam));
                operateLog.setRequest(JSON.toJSONString(request.getParameterMap()));
                request.setAttribute("operateLog", operateLog);
            }
            return true;
@@ -188,4 +182,4 @@

    }

}
}

 src/main/java/com/zy/common/config/CustomRequestFilter.java

File was deleted

 src/main/java/com/zy/common/utils/CustomHttpServletRequestWrapper.java

File was deleted

 src/main/resources/mapper/AgvWrkDetlMapper.xml

@@ -59,7 +59,7 @@
    </sql>


    <select id="selectByWrkNo" resultMap="BaseResultMap">
    <select id="selectByWrkNo11" resultMap="BaseResultMap">
        select * from asr_wrk_detl where 1=1 and wrk_no = #{wrkNo}
    </select>