优化AGV工作处理及上报逻辑

zhangc

2024-12-19 73cddc1f15fbee51a0f79189f7df631361483b0d

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

@@ -28,6 +28,7 @@
import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Date;
import java.util.EnumSet;
import java.util.Map;

@@ -65,18 +66,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 +82,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 +92,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 +123,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 ")
@@ -134,6 +147,18 @@
    public R loadContainerFinish(@RequestBody Map<String,Object> params){

        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
        );
    }
}

@@ -158,6 +183,7 @@
                agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
                agvWrkMast.setWrkSts(206L);
            }
            agvWrkMast.setModiTime(new Date());
            agvWrkMastService.updateById(agvWrkMast);
        }
    },
@@ -169,6 +195,7 @@
        public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
            //修改AGV工作档的工作状态为203.任务开始
            agvWrkMast.setWrkSts(203L);
            agvWrkMast.setModiTime(new Date());
            agvWrkMastService.updateById(agvWrkMast);
        }
    },
@@ -179,11 +206,22 @@
        @Transactional
        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","",null);
            switch(agvWrkMast.getIoType()) {
                //入库任务
                case 1:
                // 空板入库
                case 10:
                // 拣料入库任务
                case 53:
                // 盘点再入库
                case 57:
                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",null);
                    break;
            }
            //if(agvWrkMast.getIoType() == 1 || agvWrkMast.getIoType() == 53 || agvWrkMast.getIoType() == 57 || agvWrkMast.getIoType() == 10){
            //    //修改源站点状态为O.空，以及解绑托盘条码
            //    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",null);
            //}

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