#入库

zyx

2024-03-21 3673ce1c7b25f861ae91d41ce3e5cbbb96811276

 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）：
@@ -59,7 +60,7 @@

        apiLogService.save(
                "ESS任务回调",
                "/tzskwms/agv/task/event/status",
                "/phyzwms/agv/task/event/status",
                null,
                null,
                JSON.toJSONString(JSONObject.toJSONString(param)),
@@ -71,15 +72,17 @@
        //save api log (appkey 后续添加)

        AppAuthUtil.auth("",param, request);

        AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("wrk_no", param.getTaskCode()));
        if(Cools.isEmpty(agvWrkMast)){
            return R.error("任务编号错误");
        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;
@@ -98,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{
@@ -119,7 +118,13 @@
        @Transactional
        public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
            //修改AGV工作档的工作状态为205.工作完成
            agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),205);
            agvWrkMast.setWrkSts(205L);
            if(param.getLocationCode().contains("@")){
                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){
@@ -128,7 +133,7 @@
            }
            //出库任务 110.空板出库
            if(agvWrkMast.getIoType() == 110){
                agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(),"D",agvWrkMast.getBarcode());
                agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode());
            }
        }

@@ -204,7 +209,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) {