#

whycq

2024-05-14 442fce2fa9c6d8d4fe7b1f2a22d66c03b07975e5

#

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

@@ -443,8 +443,8 @@
            });
        }
        //更新目标库位状态
        updateAgvLocMast(agvLocMast,"R");
        updateAgvLocMast(locMast,"S");
        updateAgvLocMast(agvLocMast,"P");
        updateAgvLocMast(locMast,"Q");
        return "ok";
    }


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

@@ -600,15 +600,14 @@
            agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"F",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());

            // 移库取消
        }else if(wrkMast.getIoType() == 108) {
        }else if(wrkMast.getIoType() == 108 || wrkMast.getIoType() == 11 || wrkMast.getIoType() == 12) {
            //源库位
            String locNo = wrkMast.getSourceLocNo();
            //目标站点
            String devNo = wrkMast.getLocNo();

            // 目标库位
            String targetLocNo = wrkMast.getLocNo();
            agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
            if(devNo.contains("@")){
                agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"O","",null);
            }
            agvLocMastService.updateLocStsByLocNo(targetLocNo,"O","",null);
            //出库取消
        } else {
            //源库位
@@ -616,9 +615,7 @@
            //目标站点
            String devNo = wrkMast.getLocNo();
            agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
            if(devNo.contains("@")){
                agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"O","",null);
            }
            agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"O","",null);
        }

        if(wrkMast.getIoType() != 1 && wrkMast.getIoType() != 10){

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

@@ -41,7 +41,7 @@


    /*
    定时处理AGV工作档中工作状态为205.工作完成 且 （1.入库 || 53，拣料入库 || 57.盘点入库 || 10.空板入库 || 11.库格移载)的数据
    定时处理AGV工作档中工作状态为205.工作完成 且 （1.入库 || 53，拣料入库 || 57.盘点入库 || 10.空板入库 || 11.单层移库 || 12.跨层移库 || 108.自动调拨 || 109.手动调拨)的数据
     */
    @Scheduled(cron = "0/3 * * * * ? ")
    public void excutePutwayWrk(){
@@ -52,6 +52,7 @@
                .or().eq("io_type",57)
                .or().eq("io_type",10)
                .or().eq("io_type",11)
                .or().eq("io_type",12)
                .or().eq("io_type",108)
                .or().eq("io_type",109));
        if(!Cools.isEmpty(agvWrkMastList)){

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

@@ -91,19 +91,18 @@
            agvWaitPakinService.delete(new EntityWrapper<AgvWaitPakin>().eq("supp_code",barcode));
        }
        //类型为库位移转时
        if(agvWrkMast.getIoType() == 11){
        if(agvWrkMast.getIoType() == 11 || agvWrkMast.getIoType() == 12){
            //更新库存明细
            agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(),agvWrkMast.getLocNo());
            //修改源库位状态为O
            agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",null);
        }

        //类型为调拨库位移转时
        //类型为库位移转时
        if(agvWrkMast.getIoType() == 108){
            //更新库存明细
            agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(),agvWrkMast.getLocNo());
            //修改源库位状态为O

            agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue(),"",(short)0);
        }