#1

dubin

昨天 855afdc0adb8dff179fbedae8ca4fa5c6492368a

#1

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

@@ -514,6 +514,53 @@
            List<LocMast> locMasts = new ArrayList<>();
            List<LocMast> locMastsLow2 = new ArrayList<>();
            List<LocMast> locMastsLow3 = new ArrayList<>();
//            locMastsLow2 = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1",2).eq("loc_sts","O").eq("loc_type1",locTypeDto.getLocType1()));
//            locMastsLow3 = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1",3).eq("loc_sts","O").eq("loc_type1",locTypeDto.getLocType1()));
//            if (locMastsLow2.size() <= 5 && locMastsLow3.size() <= 5){
//                //低库位达到限制值 找中库位的空库位
//                locMastsLow2 = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1",2).eq("loc_sts","O").eq("loc_type1",2));
//                locMastsLow3 = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1",3).eq("loc_sts","O").eq("loc_type1",2));
//                if (locMastsLow2.size() > 5 && locMastsLow3.size() > 5){
//                    locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts","O").eq("loc_type1",2));
//                }else if (locMastsLow2.size() <= 5 && locMastsLow3.size() <= 5){
//                    //低库位 中库位达到限制值 找高库位的空库位
//                    locMastsLow2 = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1",2).eq("loc_sts","O").eq("loc_type1",5));
//                    locMastsLow3 = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1",3).eq("loc_sts","O").eq("loc_type1",5));
//                    if (locMastsLow2.size() > 5 && locMastsLow3.size() > 5){
//                        locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts","O").eq("loc_type1",5));
//                    }else if (locMastsLow2.size() <= 5 && locMastsLow3.size() <= 5){
//                        // 低中高库位达到限制值 找超高库位的空库位
//                        locMastsLow2 = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1",2).eq("loc_sts","O").eq("loc_type1",6));
//                        locMastsLow3 = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1",3).eq("loc_sts","O").eq("loc_type1",6));
//                        if (locMastsLow2.size() > 5 && locMastsLow3.size() > 5){
//                            locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts","O").eq("loc_type1",6));
//                        }else if (locMastsLow2.size() <= 5 && locMastsLow3.size() <= 5){
//                            throw new CoolException("无空库位可用");
//                        }
//                    }
//                }
//            }else {
//                locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow)
//                        .eq("loc_sts", "O").eq("loc_type1",1));
//                if (Cools.isEmpty(locMasts)){
//                    if (nearRow == 2){
//                        locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow + 1)
//                                .eq("loc_sts", "O").eq("loc_type1",1));
//                    }else if (nearRow == 3){
//                        locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow - 1)
//                                .eq("loc_sts", "O").eq("loc_type1",1));
//
//                    }
//                }
//            }








            locMastsLow2 = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", 2)
                    .eq("loc_sts", "O").eq("loc_type1",locTypeDto.getLocType1()));
            locMastsLow3 = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", 3)
@@ -545,6 +592,19 @@
                    }
                }
            }













//            locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow)
//                    .eq("loc_sts", "O").eq("loc_type1",locTypeDto.getLocType1()));
//            if (Cools.isEmpty(locMasts) || locMasts.size() <= 5){