#

zhou zhou

8 小时以前 224e8d3b57fecf5a904ffa06ef0bb8b646d73a29

#

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

@@ -119,6 +119,11 @@
    public R pdaAgvLineCall(@RequestBody Map<String,Object> map){
        return mobileService.lineCall(map);
    }
    @PostMapping("/agv/lineCall2")
    @ManagerAuth
    public R pdaAgvLineCall2(@RequestBody Map<String,Object> map){
        return mobileService.lineCall2(map);
    }

    @GetMapping("/agv/site/list")
    @ManagerAuth

 src/main/java/com/zy/asrs/service/MobileService.java

@@ -66,6 +66,8 @@

    R lineCall(Map<String, Object> map);

    R lineCall2(Map<String, Object> map);

    void AgvStaBind(CombParam combParam,Long userID);

    R FinishedCall(Map<String, Object> map);

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

@@ -1668,6 +1668,45 @@
        return R.ok();
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R lineCall2(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("数据为空");
        }
        AgvSite orgAgvSite = agvSiteService.selectOne(new EntityWrapper<AgvSite>().eq("name", orgSite));

        if (Cools.isEmpty(orgAgvSite)) {
            return R.error("站点数据错误");
        }


        WrkMast wrkMast = wrkMastService.selectById(orgAgvSite.getWorkNo());
        if (!Cools.isEmpty(wrkMast)){
            wrkMast.setWrkSts(5L);
            wrkMastService.updateById(wrkMast);
        }

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



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

        return R.ok();
    }


    public void uploadErp(InventoryErpParam param){
        String response = "";