#

tzsk

2024-05-31 b97ab3e077df3665663eb3a5b0c23d54c83a5548

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

@@ -26,6 +26,7 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.EnumSet;
import java.util.Map;

/**
 * 上报事件类型（eventType）：
@@ -77,12 +78,11 @@
        }
        AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("wrk_no", wrkNo));
        if(Cools.isEmpty(agvWrkMast)){
            return R.error("任务编号错误");
            agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode",param.getContainerCode()));
            if (Cools.isEmpty(agvWrkMast)){
                return R.error("任务编号错误");
            }
        }

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

        AgvTask agvTask = AgvTask.valueOf(param.getEventType());
        Class<AgvTask> clz = AgvTask.class;
@@ -101,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{
@@ -121,8 +117,35 @@
    task{
        @Transactional
        public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {

            //针对同一个料箱入库时产生两条不同目标库位的入库工作档
            if(agvWrkMast.getIoType() == 1 && !Cools.eq(agvWrkMast.getLocNo(),param.getLocationCode())){

                //查询新的工作档
                AgvWrkMast agvWrkMast1 = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>()
                        .eq("barcode", param.getContainerCode())
                        .eq("loc_no",param.getLocationCode()));

                if(!Cools.isEmpty(agvWrkMast1)){
                    //取消工作档
                    String locNo = agvWrkMast.getLocNo();
                    agvLocMastService.updateLocStsByLocNo(locNo,"O","");
                    agvWrkMastService.deleteByWrkNo(agvWrkMast.getWrkNo());
                    agvWrkDetlService.deleteByWrkNo(agvWrkMast.getWrkNo());

                    agvWrkMast = agvWrkMast1;
                }
            }


            //修改AGV工作档的工作状态为205.工作完成
            agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),205);
            agvWrkMast.setWrkSts(205L);
            if(param.getLocationCode().contains("@") && param.getLocationCode().contains("CS")){
                agvWrkMast.setLocNo(param.getLocationCode());
            }
            //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){
@@ -131,7 +154,7 @@
            }
            //出库任务 110.空板出库
            if(agvWrkMast.getIoType() == 110){
                agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(),"D",agvWrkMast.getBarcode());
                agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode());
            }
        }

@@ -207,7 +230,11 @@
        @Transactional
        public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
            //修改工作档状态为204.放货完成
            agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),204);
            agvWrkMast.setWrkSts(204L);
            //agvWrkMast.setLocNo(param.getLocationCode());
            agvWrkMastService.updateById(agvWrkMast);
            //agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),204);

        }

        public void fail(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {