#

whycq

2024-05-21 0039eea93ca5fc77b2b9d0b0ab7babefe2316034

#

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

@@ -531,8 +531,11 @@
        Date now = new Date();
        AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", param.getDevNo()));
        Integer oldWrkNo = agvWrkMast.getWrkNo();
        if (agvWrkMast.getBarcode() != param.getBarcode()) {
            throw new CoolException("回退任务的货架码与当前货架码不一致1");
        if (!agvWrkMast.getBarcode().equals(param.getBarcode())) {
            throw new CoolException("回退任务的货架码与当前货架码不一致!");
        }
        if (agvWrkMast.getWrkSts() != 205) {
            throw new CoolException("出库任务未完成!");
        }
        // 新建回退工作档
        AgvWrkMast wrkMast = createWrkMast(58, 201L, agvWrkMast.getLocNo(), agvWrkMast.getSourceLocNo(), agvWrkMast.getBarcode(), now, userId, agvWrkMast.getWhsType(), 0);

 src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java

@@ -50,6 +50,7 @@
                .andNew().eq("io_type",53)
                .or().eq("io_type",1)
                .or().eq("io_type",57)
                .or().eq("io_type",58)
                .or().eq("io_type",10)
                .or().eq("io_type",11)
                .or().eq("io_type",12)

 src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java

@@ -106,7 +106,7 @@
            agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue(),"",(short)0);
        }

        if(agvWrkMast.getIoType() == 109){
        if(agvWrkMast.getIoType() == 109 || agvWrkMast.getIoType() == 58){
            //修改源库位状态为O
            agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue(),"",(short)0);
        }