#MES上报

zyx

2024-07-10 2cd1fab84d88a16063d5036e77d690e9709f5d68

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

@@ -65,18 +65,12 @@
    @AppAuth(memo = "ESS任务回调")
    public R taskEventStaus(@RequestBody AgvTaskCallBackParam param, HttpServletRequest request){

        apiLogService.save(
                "ESS任务回调",
                "/phyzwms/agv/task/event/status",
                null,
                null,
                JSON.toJSONString(JSONObject.toJSONString(param)),
                null,
                true
        );



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

        R r = new R(0, "成功");

        AppAuthUtil.auth("",param, request);
        int wrkNo = Integer.parseInt(param.getTaskCode());
@@ -87,7 +81,9 @@
        if(Cools.isEmpty(agvWrkMast)){
            agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode",param.getPodCode()));
            if (Cools.isEmpty(agvWrkMast)){
                return R.error("任务编号错误");
                r = R.error("任务编号错误");
                logPost(param,JSONObject.toJSONString(r),false);
                return r;
            }
        }
        if (agvWrkMast.getIoType().equals(121)){
@@ -95,20 +91,29 @@
                if (agvWrkMast.getWrkSts().equals(12L)){
                    WrkMastExecute wrkMastExecute = wrkMastExecuteService.selectOne(new EntityWrapper<WrkMastExecute>().eq("wrk_no", wrkNo));
                    if (Cools.isEmpty(wrkMastExecute) || wrkMastExecute.getWrkSts()!=1){
                        return R.error("任务状态WrkSts参数有误,WrkSts:"+wrkMastExecute.getWrkSts$());
                        r = R.error("任务状态WrkSts参数有误,WrkSts:"+wrkMastExecute.getWrkSts$());
                        logPost(param,"任务状态WrkSts参数有误,WrkSts:"+wrkMastExecute.getWrkSts$()+JSONObject.toJSONString(r),false);
                        return r;
                    } else {
                        wrkMastExecute.setWrkSts(wrkMastExecute.getWrkStsCode());
                        wrkMastExecuteService.updateById(wrkMastExecute);
                    }
                }else {
                    return R.error("任务异常");
                    r = R.error("任务异常");
                    logPost(param,JSONObject.toJSONString(r),false);

                    return r;
                }
            }catch (Exception e){
                return R.error(""+e.getMessage());
                r = R.error(""+e.getMessage());
                logPost(param,JSONObject.toJSONString(r),false);
                return r;
            }
        }else {
            if(agvWrkMast.getWrkSts() >= 205){
                return R.error("当前任务已完成");
                r = R.error("当前任务已完成");
                logPost(param,JSONObject.toJSONString(r),false);
                return r;
            }

            AgvTask agvTask = AgvTask.valueOf(param.getMethod());
@@ -117,16 +122,23 @@
                Method method = clz.getDeclaredMethod("success", AgvWrkMast.class, AgvTaskCallBackParam.class);
                method.invoke(agvTask,agvWrkMast,param);
            } catch (NoSuchMethodException e) {
                return R.error("任务状态status参数有误");
                r = R.error("任务状态status参数有误");
                logPost(param,JSONObject.toJSONString(r),false);
                return r;
            } catch (InvocationTargetException e) {
                log.error(e.getMessage());
                return R.error();
                r = R.error(""+e.getMessage());
                logPost(param,JSONObject.toJSONString(r),false);
                return r;
            } catch (IllegalAccessException e) {
                log.error(e.getMessage());
                return R.error();
                r = R.error(""+e.getMessage());
                logPost(param,JSONObject.toJSONString(r),false);
                return r;
            }
        }
        return new R(0, "成功");
        logPost(param,JSONObject.toJSONString(r),true);
        return r;
    }

    @PostMapping("/conveyor/loadContainerFinish ")
@@ -135,6 +147,18 @@

        return R.ok();
    }

    private void logPost( AgvTaskCallBackParam param,String response,boolean success){
        apiLogService.save(
                "ESS任务回调",
                "/phyzwms/agv/task/event/status",
                null,
                null,
                JSON.toJSONString(JSONObject.toJSONString(param)),
                response,
                success
        );
    }
}

enum AgvTask{