#

whycq

2024-04-16 114657d034c80ca40f08d767a71d169c34bde0b5

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

@@ -228,21 +228,26 @@

        List<AgvLocDetl> listByLocNo = null;
        List<AgvLocDetl> listByContainerCode = null;

        if(!Cools.isEmpty(locNo)){
            // 源库位
            listByLocNo = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
        }
        if(!Cools.isEmpty(locNo)){
            // 目标库位
            listByContainerCode = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("supp_code", containerCode));
        }

        AgvLocMast agvLocMastByContainerCode = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("barcode", containerCode));
        AgvLocMast agvLocMastByLocNo = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));

        if(Cools.eq("F",agvLocMastByContainerCode.getLocSts())
                || Cools.eq("D",agvLocMastByContainerCode.getLocSts())
                || Cools.eq("F",agvLocMastByLocNo.getLocSts())
                || Cools.eq("D",agvLocMastByLocNo.getLocSts())){
        String locNo1 = listByContainerCode.get(0).getLocNo();
        String suppCode = listByLocNo.get(0).getSuppCode();

        List<AgvLocDetl> supp_codes = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("supp_code", suppCode));
        if((!Cools.eq("F",agvLocMastByContainerCode.getLocSts())
                && !Cools.eq("D",agvLocMastByContainerCode.getLocSts()))
                || (!Cools.eq("F",agvLocMastByLocNo.getLocSts())
                && !Cools.eq("D",agvLocMastByLocNo.getLocSts()))){

            return R.error("库位状态不为F或者D，无法维护");

@@ -252,8 +257,9 @@
        if(Cools.isEmpty(listByLocNo) && !Cools.isEmpty(listByContainerCode)){
            //更新货架信息的库位为当前库位
            listByContainerCode.forEach(agvLocDetl -> {
                String sourceLoc = agvLocDetl.getLocNo();
                agvLocDetl.setLocNo(locNo);
                agvLocDetlService.updateLocNo(locNo,agvLocDetl);
                agvLocDetlService.updateLocNo(locNo,sourceLoc,agvLocDetl);
            });

            agvLocMastByLocNo.setLocSts("F");
@@ -271,8 +277,9 @@
        if(!Cools.isEmpty(listByLocNo) && Cools.isEmpty(listByContainerCode)){
            //更新货架信息的库位为当前库位
            listByLocNo.forEach(agvLocDetl -> {
                String sourceLoc = agvLocDetl.getLocNo();
                agvLocDetl.setLocNo(agvLocMastByContainerCode.getLocNo());
                agvLocDetlService.updateLocNo(locNo,agvLocDetl);
                agvLocDetlService.updateLocNo(locNo,sourceLoc,agvLocDetl);
            });

            agvLocMastByContainerCode.setLocSts("F");
@@ -288,16 +295,29 @@
            return R.ok("该库位与容器库存一致，无需维护");
        }



        listByContainerCode.forEach(agvLocDetl -> {
            String sourceLoc = agvLocDetl.getLocNo();
            agvLocDetl.setLocNo(agvLocMastByLocNo.getLocNo());
            agvLocDetlService.updateLocNo(locNo,agvLocDetl);
            agvLocDetlService.updateLocNo(locNo,sourceLoc,agvLocDetl);
        });

        listByLocNo.forEach(agvLocDetl -> {
            agvLocDetl.setLocNo(agvLocMastByContainerCode.getLocNo());
            agvLocDetlService.updateLocNo(locNo,agvLocDetl);
        });

        supp_codes.forEach(agvLocDetl -> {
            agvLocDetl.setLocNo(locNo1);
            agvLocDetlService.updateLocNo(locNo1,locNo,agvLocDetl);
        });
//        listByLocNo.forEach(agvLocDetl -> {
//            String sourceLoc = agvLocDetl.getLocNo();
//            agvLocDetl.setLocNo(agvLocMastByContainerCode.getLocNo());
//            agvLocDetlService.updateLocNo(sourceLoc,locNo,agvLocDetl);
//        });
        agvLocMastByContainerCode.setBarcode(agvLocMastByLocNo.getBarcode());
        agvLocMastService.updateById(agvLocMastByContainerCode);

        agvLocMastByLocNo.setBarcode(containerCode);
        agvLocMastService.updateById(agvLocMastByLocNo);

        return R.ok("维护成功");