1.完善出库任务呼叫agv 2.完善agv任务下发 3.等等

zwl

8 天以前 b6681bc12173c1179d0185805ba461211472ac18

 src/main/java/com/zy/asrs/service/impl/RcsServiceImpl.java

@@ -233,7 +233,7 @@
            RcsReturn rcsReturn = JSONObject.parseObject(response, RcsReturn.class);
            if("SUCCESS".equals(rcsReturn.getCode())||"200".equals(rcsReturn.getCode())) {
                JSONObject data = rcsReturn.getData();
                String robotTaskCode = data.getString("RobotTaskCode");
                String robotTaskCode = data.getString("robotTaskCode");
                if (robotTaskCode.equals(rcsTaskSubmit.getRobotTaskCode())){
                    return 1;
                }
@@ -256,7 +256,7 @@
        String response = sendPost(url, JSONObject.toJSONString(rcsTaskContinue));
        if (!StringUtils.isEmpty(response) && response.contains("code")){
            RcsReturn rcsReturn = JSONObject.parseObject(response, RcsReturn.class);
            if("200".equals(rcsReturn.getCode())) {
            if("SUCCESS".equals(rcsReturn.getCode())||"200".equals(rcsReturn.getCode())) {
                return 1;
            }
        }
@@ -327,6 +327,8 @@

        String robotTaskCode = rcsReporterTask.getRobotTaskCode();
        String singleRobotCode = rcsReporterTask.getSingleRobotCode();
        String[] split = robotTaskCode.split("-");
        robotTaskCode = split[0];
        //华晓AGV状态反馈，及申请
        if(Cools.isEmpty(rcsReporterTask.getExtra())){
            if(Cools.isEmpty(rcsReporterTask.getMethod())){
@@ -445,7 +447,7 @@
            String slotCode = values.getString("slotCode");
            try {
                // q3,q8=1
                if ("1".equals(carrierType)) {    //AGV

                    EntityWrapper<Task> wrapper = new EntityWrapper<>();
                    wrapper.eq("task_no", robotTaskCode);
                    Task task = taskService.selectOne(wrapper);
@@ -561,7 +563,7 @@
                        }
                        break;
                    }
                }

                // 返回RCS
                rcsReturn.setCode("SUCCESS");
                rcsReturn.setMessage("");
@@ -749,7 +751,7 @@
            {
                result.append(line);
            }
            log.info("recv - {}", result);
            log.info("rec - {}", result);
        }
        catch (ConnectException e)
        {