#

zjj

1 天以前 428dbbc6f0744283c11bcac42bf037116d4a1e18

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

@@ -161,6 +161,10 @@
            case "3010":
                wrapper.in("source_sta_no", "3013", "3014");
                break;
            case "1000":
            case "1035":
                wrapper.in("source_sta_no", "1024", "1028");
                break;
            default:
        }
        int count = wrkMastService.selectCount(wrapper);
@@ -201,8 +205,11 @@
            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);
                }

            } else {
                message = jsonObject.getString("message");
                log.error("入库呼叫agv失败！！！url：{}；request：{}；response：{}", ApiInterfaceConstant.AGV_IP + ApiInterfaceConstant.AGV_CALL_IN_PATH, body, response);
@@ -1362,28 +1369,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);
        if (!success){
            throw new CoolException("呼叫agv失败");
        }

        return R.ok();
    }