ERP单据上传用户名称

zyx

2023-10-13 0966fafc54a80ca6634d7020324a734d282e603c

 src/main/java/com/zy/asrs/controller/AgvOpenController.java

@@ -1,5 +1,7 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.common.Cools;
@@ -55,16 +57,27 @@
    @AppAuth(memo = "ESS任务回调")
    public R taskEventStaus(@RequestBody AgvTaskCallBackParam param, HttpServletRequest request){

        //save api log (appkey 后续添加)
        AppAuthUtil.auth("test-appkey",param, request);
        apiLogService.save(
                "ESS任务回调",
                "/tzskwms/agv/task/event/status",
                null,
                null,
                JSON.toJSONString(JSONObject.toJSONString(param)),
                null,
                true
        );

        AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("wrk_no", param.getTaskCode()));

        //save api log (appkey 后续添加)

        AppAuthUtil.auth("",param, request);
        int wrkNo = Integer.parseInt(param.getTaskCode());
        if(wrkNo < 0){
            wrkNo = -wrkNo;
        }
        AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("wrk_no", wrkNo));
        if(Cools.isEmpty(agvWrkMast)){
            return R.error("任务编号错误");
        }

        if(!checkParam(param,agvWrkMast)){
            return R.error("任务参数与工作档参数不符合");
        }

        AgvTask agvTask = AgvTask.valueOf(param.getEventType());
@@ -84,15 +97,6 @@
        return R.ok();
    }

    private boolean checkParam(AgvTaskCallBackParam param, AgvWrkMast agvWrkMast){
        if(!agvWrkMast.getLocNo().equals(param.getLocationCode())){
            return false;
        }
        if(!agvWrkMast.getSourceLocNo().equals(param.getStationCode())){
            return false;
        }
        return true;
    }

}