自动出空板到入库口

野心家

2024-11-08 f64082f012503105373eb4ca36a2ecfd2ad8415e

 src/main/java/com/zy/common/service/CommonService.java

@@ -475,7 +475,7 @@
                    if (Cools.isEmpty(locMast1)) {
                        continue;
                    }
                    if (locMast1.getLev1() != lev && locMast1.getLev1() !=2) {
                    if (locMast1.getLev1() != lev && locMast1.getLev1() !=3) {
                        List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                                .eq("lev1", locMast1.getLev1())
                                .orderBy("bay1",false));
@@ -501,9 +501,23 @@
                        if (locMast2.getLocSts().equals("O") ) {
                            if (locMast == null){
                                locMast = locMast2;
                            }else if (locMast2.getLocSts().equals("F")){
                                locMast = null;
                            }
                        }else if (locMast2.getLocSts().equals("F")){
                            locMast = null;
                        }
                    }
                }
                if(Cools.isEmpty(locMast)){
                    List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                            .eq("lev1", 2)
                            .orderBy("bay1",false));
                    for (LocMast locMast2 : locMasts) {
                        if (locMast2.getLocSts().equals("O") ) {
                            if (locMast == null){
                                locMast = locMast2;
                            }
                        }else if (locMast2.getLocSts().equals("F")){
                            locMast = null;
                        }
                    }
                }