#

zjj

1 天以前 4cd83996517bedf7ed817ae4cadcd5b8ebc80086

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

@@ -141,6 +141,25 @@
    }

    @Override
    public R FinishedCall(Map<String, Object> map) {
        String orgSite =  map.get("orgSite").toString();
        String tarSite = map.get("tarSite").toString();
        if (Cools.isEmpty(orgSite) || Cools.isEmpty(tarSite)) {
            return R.error("数据为空");
        }
        if (orgSite.charAt(0) != 'd'){
            throw new CoolException("站点异常，只允许d开头站点");
        }
//        呼叫agv
        boolean success = sendAgvTask2(orgSite, tarSite,"GT6");
        if (!success){
            throw new CoolException("呼叫agv失败");
        }

        return R.ok();
    }

    @Override
    public R inLocCallAgv(String sta, String inSta) {

        BasDevp basDevp = basDevpMapper.selectById(inSta);
@@ -205,8 +224,12 @@
            if (jsonObject.getInteger("code").equals(0)) {
                success = true;
                // 入库暂存+1
                basDevp.setInQty(basDevp.getInQty() + 1);
                basDevpMapper.updateById(basDevp);
                if (!inSta.equals("1000") && !inSta.equals("1035")){
                    basDevp.setInQty(basDevp.getInQty() + 1);
                    basDevpMapper.updateById(basDevp);
                    log.info("入库呼叫，"+basDevp.getDevNo()+"+1");
                }

            } else {
                message = jsonObject.getString("message");
                log.error("入库呼叫agv失败！！！url：{}；request：{}；response：{}", ApiInterfaceConstant.AGV_IP + ApiInterfaceConstant.AGV_CALL_IN_PATH, body, response);
@@ -284,12 +307,64 @@
        return success ? R.ok("解绑成功") : R.parse(message);
    }

    public boolean sendAgvTask(String org,String tar){
    public boolean sendAgvTask2(String org,String tar,String type){

        ForwardAGVTaskParam forwardAGVTaskParam = new ForwardAGVTaskParam();
        forwardAGVTaskParam.setReqCode(UUID.randomUUID().toString().replace("-", ""));
        forwardAGVTaskParam.setClientCode("IWMS");
        forwardAGVTaskParam.setTaskTyp("GT3");
        forwardAGVTaskParam.setTaskTyp(type);
        forwardAGVTaskParam.setCtnrTyp("2");
        forwardAGVTaskParam.setPriority("1");
        List<ForwardAGVTaskParam.PositionCodePaths> positionCodePathsList = new ArrayList<>();
        positionCodePathsList.add(new ForwardAGVTaskParam.PositionCodePaths(org, "05"));
        positionCodePathsList.add(new ForwardAGVTaskParam.PositionCodePaths(tar, "04"));
        forwardAGVTaskParam.setPositionCodePath(positionCodePathsList);

        String body = JSON.toJSONString(forwardAGVTaskParam);
        String response = "";
        String message = "";
        boolean success = false;
        try {
            response = new HttpHandler.Builder()
                    .setUri(ApiInterfaceConstant.AGV_IP)
                    .setPath(ApiInterfaceConstant.AGV_CALL_IN_PATH)
                    .setJson(body)
                    .build()
                    .doPost();
            JSONObject jsonObject = JSON.parseObject(response);
            if (jsonObject.getInteger("code").equals(0)) {
                success = true;
            } else {

                log.error("呼叫agv失败！！！url：{}；request：{}；response：{}", ApiInterfaceConstant.AGV_IP + ApiInterfaceConstant.AGV_CALL_IN_PATH, body, response);
            }
        } catch (Exception e) {
            log.error("入库呼叫agv异常", e);
        } finally {
            try {
                // 保存接口日志
                apiLogService.save(
                        "入库呼叫agv",
                        ApiInterfaceConstant.AGV_IP + ApiInterfaceConstant.AGV_CALL_IN_PATH,
                        null,
                        "127.0.0.1",
                        body,
                        response,
                        success
                );
            } catch (Exception e) {
                log.error("", e);
            }
        }
        return success;
    }

    public boolean sendAgvTask(String org,String tar,String type){

        ForwardAGVTaskParam forwardAGVTaskParam = new ForwardAGVTaskParam();
        forwardAGVTaskParam.setReqCode(UUID.randomUUID().toString().replace("-", ""));
        forwardAGVTaskParam.setClientCode("IWMS");
        forwardAGVTaskParam.setTaskTyp(type);
        forwardAGVTaskParam.setCtnrTyp("2");
        forwardAGVTaskParam.setPriority("1");
        List<ForwardAGVTaskParam.PositionCodePaths> positionCodePathsList = new ArrayList<>();
@@ -1366,28 +1441,37 @@
        }
        AgvSite orgAgvSite = agvSiteService.selectOne(new EntityWrapper<AgvSite>().eq("name", orgSite));

        AgvSite tarAgvSite = agvSiteService.selectOne(new EntityWrapper<AgvSite>().eq("name", tarSite));
        if (Cools.isEmpty(orgAgvSite) || Cools.isEmpty(tarAgvSite)) {
//        AgvSite tarAgvSite = agvSiteService.selectOne(new EntityWrapper<AgvSite>().eq("name", tarSite));
        if (Cools.isEmpty(orgAgvSite)) {
            return R.error("站点数据错误");
        }

        //更新tar站点状态
        tarAgvSite.setWorkNo(orgAgvSite.getWorkNo());
        tarAgvSite.setStatus(2);
        if (!agvSiteService.updateById(tarAgvSite)){
            throw new CoolException("叫料站更新失败");
//        tarAgvSite.setWorkNo(orgAgvSite.getWorkNo());
//        tarAgvSite.setStatus(2);
//        if (!agvSiteService.updateById(tarAgvSite)){
//            throw new CoolException("叫料站更新失败");
//        }
        WrkMast wrkMast = wrkMastService.selectById(orgAgvSite.getWorkNo());
        if (!Cools.isEmpty(wrkMast)){
            wrkMast.setWrkSts(5L);
            wrkMastService.updateById(wrkMast);
        }

        //更新org站点状态
        orgAgvSite.setStatus(2);
        orgAgvSite.setStatus(0);
        orgAgvSite.setWorkNo(null);
        if (!agvSiteService.updateById(orgAgvSite)){
            throw new CoolException("源站更新失败");
        }

        //呼叫agv
//        boolean success = sendAgvTask(orgSite, tarSite);
//        if (!success){
//            throw new CoolException("呼叫agv失败");
//        }


//        呼叫agv
        boolean success = sendAgvTask(orgSite, tarSite,"GT6");
        if (!success){
            throw new CoolException("呼叫agv失败");
        }

        return R.ok();
    }