#

whycq

2024-04-24 d58092aced22e65141938c81aebd55dbfad5bde7

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

@@ -10,6 +10,7 @@
import com.zy.asrs.entity.param.AgvMobileStartPakin;
import com.zy.asrs.entity.param.AgvMobileStartParam;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.PickParam;
import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
import lombok.Synchronized;
@@ -56,6 +57,14 @@
        agvMobileService.comb(combParam, getUserId());

        return R.ok();
    }

    //    再次拣料
    @RequestMapping("/pick/again/auth")
//    @ManagerAuth(memo = "组托")
    public R pickAgain(@RequestBody PickParam pickParams){
        agvMobileService.pickAgain(pickParams, 1l);
        return R.ok("组托成功");
    }

    /*
@@ -240,10 +249,10 @@
        AgvLocMast agvLocMastByContainerCode = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("barcode", containerCode));
        AgvLocMast agvLocMastByLocNo = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));

        String locNo1 = listByContainerCode.get(0).getLocNo();
        String suppCode = listByLocNo.get(0).getSuppCode();
        String barcode1 =  agvLocMastByLocNo.getBarcode();

        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())
@@ -252,7 +261,7 @@
            return R.error("库位状态不为F或者D，无法维护");

        }

        // -------------1-----------------------------
        //库位信息为空 货架信息不为空
        if(Cools.isEmpty(listByLocNo) && !Cools.isEmpty(listByContainerCode)){
            //更新货架信息的库位为当前库位
@@ -263,29 +272,36 @@
            });

            agvLocMastByLocNo.setLocSts("F");
            agvLocMastByLocNo.setBarcode(containerCode);
            agvLocMastService.updateById(agvLocMastByLocNo);

            if(!Cools.isEmpty(agvLocMastByContainerCode) && Cools.eq("D",agvLocMastByContainerCode.getLocSts())){
            if(!Cools.isEmpty(agvLocMastByContainerCode) && Cools.eq("F",agvLocMastByContainerCode.getLocSts())){
                agvLocMastByContainerCode.setLocSts("D");
                agvLocMastByContainerCode.setBarcode(barcode1);
                agvLocMastService.updateById(agvLocMastByContainerCode);
            }

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


        // -------------2-----------------------------
        //库位信息不为空 货架信息为空
        if(!Cools.isEmpty(listByLocNo) && Cools.isEmpty(listByContainerCode)){
            String newLocNo = agvLocMastByContainerCode.getLocNo();
            //更新货架信息的库位为当前库位
            listByLocNo.forEach(agvLocDetl -> {
                String sourceLoc = agvLocDetl.getLocNo();
                agvLocDetl.setLocNo(agvLocMastByContainerCode.getLocNo());
                agvLocDetlService.updateLocNo(locNo,sourceLoc,agvLocDetl);
                agvLocDetlService.updateLocNo(newLocNo,sourceLoc,agvLocDetl);
            });

            agvLocMastByContainerCode.setLocSts("F");
            agvLocMastByContainerCode.setBarcode(agvLocMastByLocNo.getBarcode());
            agvLocMastService.updateById(agvLocMastByContainerCode);

            agvLocMastByLocNo.setLocSts("D");
            agvLocMastByLocNo.setBarcode(containerCode);
            agvLocMastService.updateById(agvLocMastByLocNo);

            return R.ok("维护成功");
@@ -297,17 +313,24 @@



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

        if (!Cools.isEmpty(listByLocNo)) {
            String suppCode = listByLocNo.get(0).getSuppCode();
            List<AgvLocDetl> supp_codes = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("supp_code", suppCode));

        supp_codes.forEach(agvLocDetl -> {
            agvLocDetl.setLocNo(locNo1);
            agvLocDetlService.updateLocNo(locNo1,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());