pang.jiabao
2024-11-06 e39c11465130d5b74be7f1db7df70e902403da49
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -662,7 +662,7 @@
                        }
                        // 更新工作档状态为14失败
                        wrkMast.setWrkSts(14L);
                        wrkMast.setWrkSts(13L);
                        wrkMast.setCrnEndTime(new Date());
                        if (wrkMastMapper.updateById(wrkMast) != 0) {
                            // 复位堆垛机
@@ -2115,10 +2115,10 @@
                } else {
                    staProtocol = staProtocol.clone();
                }
                if (!(staProtocol.stateType == DevpStateType.AUTO && staProtocol.workType == DevpWorkType.BUSY && staProtocol.requestType == DevpRequestType.OUT)){
                if (!(staProtocol.stateType == DevpStateType.AUTO && staProtocol.requestType == DevpRequestType.OUT)){
                    continue;
                }
                if (staProtocol.getWorkNo() != 0){
                if (staProtocol.getWorkNo() == 0){
                    continue;
                }
                WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", staProtocol.getWorkNo()).eq("wrk_sts", 101));
@@ -2139,7 +2139,7 @@
                getAgvTaskParam(forwardAGVTaskParam,wrkMast,staProtocol.getSiteId());
                String request = forwardAGVHttpRequest(forwardAGVTaskParam, "10.0.100.110:8182", "/rcms/services/rest/hikRpcService/genAgvSchedulingTask");
                if ("SUCCESS".equals(request)) {
                    wrkMast.setWrkSts(101L);
                    wrkMast.setWrkSts(14L);
                    boolean update = wrkMastService.updateById(wrkMast);
                    if (update){
                        log.info("入库转发AGV任务完成,任务号:"+wrkMast.getWrkNo());
@@ -2155,11 +2155,21 @@
    }
    private void getAgvTaskParam(ForwardAGVTaskParam agvTaskCreateParam,WrkMast param,Integer staNo){
        String sourceSite = "";
        if (staNo == 1040 || staNo == 1042) {
            sourceSite = "a";
        } else if (staNo == 2010 || staNo == 2012) {
            sourceSite = "b";
        } else if(staNo == 3010  || staNo ==3012) {
            sourceSite = "c";
        } else if(staNo == 2000 || staNo ==2002) {
            sourceSite = "d";
        }
        List<ForwardAGVTaskParam.PositionCodePaths> agvTaskParamList = Arrays.asList(
                //起始位
                new ForwardAGVTaskParam.PositionCodePaths(staNo.toString(),"05"),
                //目标位
                new ForwardAGVTaskParam.PositionCodePaths("a3","05")
                new ForwardAGVTaskParam.PositionCodePaths(sourceSite,"04")
        );
        Date date = new Date();
        DecimalFormat df = new DecimalFormat("0000");