#

18516761980

2022-09-26 a6076e796892c476f7b38a5ee475a5f5591d7625

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

@@ -198,13 +198,13 @@

                Integer ruleId = Integer.parseInt(Parameter.get().getFindLocRule());
                if (ruleId == 0){//默认规则
                    locMast = locMastService.queryFreeLocMast(1, locTypeDto.getLocType1());
                    locMast = locMastService.queryFreeLocMast(2, locTypeDto.getLocType1());
                } else if (ruleId == 1){ //按测试设备排序，优先排满单台设备
                    locMast = locMastService.queryFreeLocMast1(1, locTypeDto.getLocType1());
                    locMast = locMastService.queryFreeLocMast1(2, locTypeDto.getLocType1());
                } else if (ruleId == 2){//按通道排序，均匀分配每台设备
                    locMast = locMastService.queryFreeLocMast2(1, locTypeDto.getLocType1(), curRow);
                    locMast = locMastService.queryFreeLocMast2(2, locTypeDto.getLocType1(), curRow);
                } else {
                    locMast = locMastService.queryFreeLocMast(1, locTypeDto.getLocType1());
                    locMast = locMastService.queryFreeLocMast(2, locTypeDto.getLocType1());
                }

            }