Merge remote-tracking branch 'origin/wz-JiAo-wms' into wz-JiAo-wms

野心家

6 天以前 c3e47e5e70a9055b7d25c118eb1f7ec3c869e953

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

@@ -45,7 +45,6 @@
        List<LocMast> locMastsO=locMastService.selectList(new EntityWrapper<LocMast>()
                .eq("loc_sts","O").eq("lev1",1).orderBy("bay1",false));
        if(Cools.isEmpty(locMastsO)){
            log.info("自动移库没有空库位，请关闭自动库位功能");
            return FAIL;
        }
        LocMast locMast1 = locMastsO.get(0);
@@ -136,7 +135,6 @@
        List<LocMast> locMastsO=locMastService.selectList(new EntityWrapper<LocMast>()
                .eq("loc_sts","O").eq("lev1",2).orderBy("bay1",false));
        if(Cools.isEmpty(locMastsO)){
            log.info("自动移库没有空库位，请关闭自动库位功能");
            return FAIL;
        }
        LocMast locMast1 = locMastsO.get(0);
@@ -225,7 +223,6 @@
        List<LocMast> locMastsO=locMastService.selectList(new EntityWrapper<LocMast>()
                .eq("loc_sts","O").eq("lev1",3).orderBy("bay1",true));
        if(Cools.isEmpty(locMastsO)){
            log.info("自动移库没有空库位，请关闭自动库位功能");
            return FAIL;
        }
        LocMast locMast1 = locMastsO.get(0);
@@ -318,21 +315,24 @@
            List<LocMast> locMastsF=locMastService.selectList(new EntityWrapper<LocMast>()
                    .eq("loc_sts",sts).eq("lev1",i).orderBy("bay1",boo));
            List<LocMast> locMastsO=locMastService.selectList(new EntityWrapper<LocMast>()
                    .eq("loc_sts",sts).eq("lev1",i).orderBy("bay1",boo));
                    .eq("loc_sts","O").eq("lev1",i).orderBy("bay1",boo));
            if(Cools.isEmpty(locMastsO)){
                log.info("自动移库没有空库位，请关闭自动库位功能");
                return FAIL;
                continue;
            }
            LocMast locMast1 = locMastsO.get(0);

            LocMast locMast2 = locMastsF.get(locMastsF.size()-1);
            if(locMast2.getBay1()>locMast1.getBay1()){
                return FAIL;
            if(i!=3&&locMast2.getBay1()>locMast1.getBay1()){
                continue;
            }else if(i==3&&locMast2.getBay1()<locMast1.getBay1()){
                continue;
            }

            String locNo=null;
            for(LocMast locMast:locMastsF){
                if(locMast.getBay1()<locMast1.getBay1()){
                if(i!=3&&locMast.getBay1()<locMast1.getBay1()){
                    locNo=locMast1.getLocNo();
                }else if(i==3&&locMast.getBay1()>locMast1.getBay1()){
                    locNo=locMast1.getLocNo();
                }
                //生成移库任务
@@ -349,10 +349,16 @@
                    wrkMast.setCrnNo(1);
                    wrkMast.setSourceLocNo(locMast.getLocNo()); // 源库位
                    wrkMast.setLocNo(locNo); // 目标库位
                    wrkMast.setFullPlt("Y"); // 满板
                    if(i!=3){
                        wrkMast.setFullPlt("Y"); // 满板
                        wrkMast.setEmptyMk("N"); // 空板
                    }else{
                        wrkMast.setFullPlt("N"); // 满板
                        wrkMast.setEmptyMk("Y"); // 空板
                    }
                    wrkMast.setPicking("N"); // 拣料
                    wrkMast.setExitMk("N"); // 退出
                    wrkMast.setEmptyMk("N"); // 空板

                    wrkMast.setBarcode(locMast.getBarcode()); // 托盘码
                    wrkMast.setLinkMis("N");
                    wrkMast.setAppeTime(new Date());
@@ -366,6 +372,7 @@
                        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
                        for (LocDetl locDetl : locDetls) {
                            WrkDetl wrkDetl = new WrkDetl();
                            wrkDetl.sync(locDetl);
                            wrkDetl.setWrkNo(workNo);
                            wrkDetl.setIoTime(new Date());
                            wrkDetl.setAnfme(locDetl.getAnfme());