# 操作日志

whycq

2024-05-29 b8f320c817c486c33613ca196ceab7c8fd354bae

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

@@ -72,7 +72,7 @@
        //save api log (appkey 后续添加)

        AppAuthUtil.auth("",param, request);
        int wrkNo = Integer.parseInt(param.getReqCode());
        int wrkNo = Integer.parseInt(param.getTaskCode());
        if(wrkNo < 0){
            wrkNo = -wrkNo;
        }
@@ -82,6 +82,10 @@
            if (Cools.isEmpty(agvWrkMast)){
                return R.error("任务编号错误");
            }
        }

        if(agvWrkMast.getWrkSts() >= 205){
            return R.error("当前任务已完成");
        }

        AgvTask agvTask = AgvTask.valueOf(param.getMethod());
@@ -102,7 +106,7 @@
    }

    @PostMapping("/conveyor/loadContainerFinish ")
    @AppAuth(memo = "取容器完成通知")
    @AppAuth(memo = "取货架完成通知")
    public R loadContainerFinish(@RequestBody Map<String,Object> params){

        return R.ok();
@@ -112,17 +116,13 @@
enum AgvTask{

    /**
     * 上报任务状态
     * 上报任务完成
     */
    end{
        @Transactional
        public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
            //修改AGV工作档的工作状态为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){
@@ -132,21 +132,24 @@
            //出库任务 110.空板出库
            if(agvWrkMast.getIoType() == 110){
                agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
                agvWrkMast.setWrkSts(206L);
            }
            agvWrkMastService.updateById(agvWrkMast);
        }
    },
    /**
     * 上报任务分配给机器人
     * 任务开始
     */
    start{
        @Transactional
        public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {

            //修改AGV工作档的工作状态为203.任务开始
            agvWrkMast.setWrkSts(203L);
            agvWrkMastService.updateById(agvWrkMast);
        }

    },
    /**
     * 上报取箱状态
     * 走出储位状态
     */
    outbin{
        @Transactional
@@ -159,7 +162,7 @@
            }

            //修改AGV工作档的工作状态为203.RCS放货中
            agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),203);
            agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),204);

        }

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


        }