Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1

Junjie

2023-12-23 a0abdbc0b19c855fa53e47a9196dfa2cd41e8e9d

 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;
@@ -24,6 +26,7 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.EnumSet;
import java.util.Map;

/**
 * 上报事件类型（eventType）：
@@ -55,23 +58,37 @@
    @AppAuth(memo = "ESS任务回调")
    public R taskEventStaus(@RequestBody AgvTaskCallBackParam param, HttpServletRequest request){

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


        //save api log (appkey 后续添加)
        AppAuthUtil.auth("test-appkey",param, request);

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

        if(!checkParam(param,agvWrkMast)){
            return R.error("任务参数与工作档参数不符合");
        AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("wrk_no", wrkNo));
        if(Cools.isEmpty(agvWrkMast)){
            agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode",param.getContainerCode()));
            if (Cools.isEmpty(agvWrkMast)){
                return R.error("任务编号错误");
            }
        }

        AgvTask agvTask = AgvTask.valueOf(param.getEventType());
        Class<AgvTask> clz = AgvTask.class;
        try {
            Method method = clz.getDeclaredMethod(param.getStatus(),AgvTaskCallBackParam.class);
            method.invoke(agvTask,param);
            Method method = clz.getDeclaredMethod(param.getStatus(), AgvWrkMast.class, AgvTaskCallBackParam.class);
            method.invoke(agvTask,agvWrkMast,param);
        } catch (NoSuchMethodException e) {
            return R.error("任务状态status参数有误");
        } catch (InvocationTargetException e) {
@@ -84,16 +101,12 @@
        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;
    }
    @PostMapping("/conveyor/loadContainerFinish ")
    @AppAuth(memo = "取容器完成通知")
    public R loadContainerFinish(@RequestBody Map<String,Object> params){

        return R.ok();
    }
}

enum AgvTask{
@@ -103,20 +116,33 @@
     */
    task{
        @Transactional
        public void success(AgvTaskCallBackParam param) {
        public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
            //修改AGV工作档的工作状态为205.工作完成
            agvWrkMastService.updateWrkStsByWrkNo(Integer.valueOf(param.getTaskCode()),205);
            agvWrkMast.setWrkSts(205L);
            agvWrkMast.setLocNo(param.getLocationCode());
            agvWrkMastService.updateById(agvWrkMast);
            //agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),205);

            //出库任务 101.出库 || 103.拣料出库 || 107.盘点出库
            if(agvWrkMast.getIoType() == 101 || agvWrkMast.getIoType() == 103 || agvWrkMast.getIoType() == 107){
                //修改出库站点状态
                agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode());
            }
            //出库任务 110.空板出库
            if(agvWrkMast.getIoType() == 110){
                agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode());
            }
        }

        public void fail(AgvTaskCallBackParam param) {
        public void fail(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {

        }

        public void cancel(AgvTaskCallBackParam param) {
        public void cancel(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {

        }

        public void suspend(AgvTaskCallBackParam param) {
        public void suspend(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {

        }
    },
@@ -125,19 +151,19 @@
     */
    task_allocated{
        @Transactional
        public void success(AgvTaskCallBackParam param) {
        public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {

        }

        public void fail(AgvTaskCallBackParam param) {
        public void fail(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {

        }

        public void cancel(AgvTaskCallBackParam param) {
        public void cancel(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {

        }

        public void suspend(AgvTaskCallBackParam param) {
        public void suspend(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {

        }
    },
@@ -146,25 +172,30 @@
     */
    tote_load{
        @Transactional
        public void success(AgvTaskCallBackParam param) {
            //修改源站点状态为O.空，以及解绑托盘条码
            agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getStationCode(),"O","");
        public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {

            //入库任务 || 拣料入库任务 ||盘点再入库 ||空板入库
            if(agvWrkMast.getIoType() == 1 || agvWrkMast.getIoType() == 53 || agvWrkMast.getIoType() == 57 || agvWrkMast.getIoType() == 10){
                //修改源站点状态为O.空，以及解绑托盘条码
                agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","");
            }

            //修改AGV工作档的工作状态为203.RCS放货中
            agvWrkMastService.updateWrkStsByWrkNo(Integer.valueOf(param.getTaskCode()),203);
            //修改AGV入库通知档状态
            //agvWaitPakinService.updateIoStatus(Integer.valueOf(param.getTaskCode()),"Y");
            agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),203);



        }

        public void fail(AgvTaskCallBackParam param) {
        public void fail(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {

        }

        public void cancel(AgvTaskCallBackParam param) {
        public void cancel(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {

        }

        public void suspend(AgvTaskCallBackParam param) {
        public void suspend(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {

        }
    },
@@ -173,86 +204,90 @@
     */
    tote_unload{
        @Transactional
        public void success(AgvTaskCallBackParam param) {
        public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
            //修改工作档状态为204.放货完成
            agvWrkMastService.updateWrkStsByWrkNo(Integer.valueOf(param.getTaskCode()),204);
        }

        public void fail(AgvTaskCallBackParam param) {
            agvWrkMast.setWrkSts(204L);
            agvWrkMast.setLocNo(param.getLocationCode());
            agvWrkMastService.updateById(agvWrkMast);
            //agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),204);

        }

        public void cancel(AgvTaskCallBackParam param) {
        public void fail(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {

        }

        public void suspend(AgvTaskCallBackParam param) {
        public void cancel(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {

        }

        public void suspend(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {

        }
    },
    robot_reach{
        @Transactional
        public void success(AgvTaskCallBackParam param) {
        public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {

        }

        public void fail(AgvTaskCallBackParam param) {
        public void fail(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {

        }

        public void cancel(AgvTaskCallBackParam param) {
        public void cancel(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {

        }

        public void suspend(AgvTaskCallBackParam param) {
        public void suspend(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {

        }
    },
    weight{
        @Transactional
        public void success(AgvTaskCallBackParam param) {
        public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {

        }

        public void fail(AgvTaskCallBackParam param) {
        public void fail(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {

        }

        public void cancel(AgvTaskCallBackParam param) {
        public void cancel(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {

        }

        public void suspend(AgvTaskCallBackParam param) {
        public void suspend(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {

        }
    },
    rfid{
        @Transactional
        public void success(AgvTaskCallBackParam param) {
        public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {

        }

        public void fail(AgvTaskCallBackParam param) {
        public void fail(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {

        }

        public void cancel(AgvTaskCallBackParam param) {
        public void cancel(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {

        }

        public void suspend(AgvTaskCallBackParam param) {
        public void suspend(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {

        }
    };

    //任务状态为成功
    public abstract void success(AgvTaskCallBackParam param);
    public abstract void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param);
    //任务状态为失败
    public abstract void fail(AgvTaskCallBackParam param);
    public abstract void fail(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param);
    //任务状态为取消
    public abstract void cancel(AgvTaskCallBackParam param);
    public abstract void cancel(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param);
    //任务状态为挂起
    public abstract void suspend(AgvTaskCallBackParam param);
    public abstract void suspend(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param);

    @Setter
    AgvBasDevpService agvBasDevpService;