#

zhou zhou

16 小时以前 224e8d3b57fecf5a904ffa06ef0bb8b646d73a29

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

@@ -217,10 +217,15 @@
            if (orgBigDecimal.compareTo(adjustBigDecimal) == 0){
                continue;
            }
            manLocDetl1.setAnfme(adjustBigDecimal.doubleValue());
            if (!manLocDetlService.update(manLocDetl1,manLocDetlEntityWrapper)){
                throw new CoolException("更新数据失败");
            if (adjustBigDecimal.compareTo(BigDecimal.ZERO) == 0){
                manLocDetlService.delete(manLocDetlEntityWrapper);
            }else {
                manLocDetl1.setAnfme(adjustBigDecimal.doubleValue());
                if (!manLocDetlService.update(manLocDetl1,manLocDetlEntityWrapper)){
                    throw new CoolException("更新数据失败");
                }
            }




@@ -233,24 +238,24 @@
        BasDevp basDevp = basDevpMapper.selectById(inSta);

        // 判断是否有出库任务
        Wrapper<WrkMast> wrapper = new EntityWrapper<WrkMast>().lt("wrk_sts", 14).in("io_type", 101, 103, 107, 110);
        Wrapper<WrkMast> wrapper = new EntityWrapper<WrkMast>().lt("wrk_sts", 14).in("io_type", 101, 103,104, 107, 110);

        switch (inSta) {
            case "1040":
                wrapper.in("source_sta_no", "1043", "1044");
                wrapper.in("source_sta_no", "1043", "1044","1048");
                break;
            case "2010":
                wrapper.in("source_sta_no", "2013", "2014");
                wrapper.in("source_sta_no", "2013", "2014","2018");
                break;
            case "2000":
                wrapper.in("source_sta_no", "2003", "2004");
                wrapper.in("source_sta_no", "2003", "2004","2008");
                break;
            case "3010":
                wrapper.in("source_sta_no", "3013", "3014");
                wrapper.in("source_sta_no", "3013", "3014","3018");
                break;
            case "1000":
            case "1035":
                wrapper.in("source_sta_no", "1024", "1028");
                wrapper.in("source_sta_no", "1024", "1028","1031");
                break;
            default:
        }
@@ -332,7 +337,7 @@
        }
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("reqCode",UUID.randomUUID().toString().replace("-", "")); // 请求唯一值
        jsonObject.put("ctnrTyp","3"); // 容器类型2
        jsonObject.put("ctnrTyp","2"); // 容器类型2
        jsonObject.put("stgBinCode",staMap); // 仓位编号，根据客仓编号转换
        jsonObject.put("indBind","0"); // 1绑定，0解绑

@@ -397,7 +402,7 @@
        forwardAGVTaskParam.setReqCode(UUID.randomUUID().toString().replace("-", ""));
        forwardAGVTaskParam.setClientCode("IWMS");
        forwardAGVTaskParam.setTaskTyp(type);
        forwardAGVTaskParam.setCtnrTyp("3");
        forwardAGVTaskParam.setCtnrTyp("2");
        forwardAGVTaskParam.setPriority("1");
        List<ForwardAGVTaskParam.PositionCodePaths> positionCodePathsList = new ArrayList<>();
        positionCodePathsList.add(new ForwardAGVTaskParam.PositionCodePaths(org, "04"));
@@ -606,7 +611,7 @@
        }
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("reqCode",UUID.randomUUID().toString().replace("-", "")); // 请求唯一值
        jsonObject.put("ctnrTyp","3"); // 容器类型2
        jsonObject.put("ctnrTyp","2"); // 容器类型2
        jsonObject.put("stgBinCode",staMap); // 仓位编号，根据客仓编号转换
        jsonObject.put("indBind","1"); // 1绑定，0解绑

@@ -1663,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 = "";