#

LSH

2022-11-24 dfce0d94a7ed3fa1fe324359a788f0ad2f781803

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

@@ -130,12 +130,12 @@
                    curRow = 8;
                    break;
                case 8:
                    curRow = 10;
                    curRow = 11;
                    break;
                case 10:
                    curRow = 12;
                case 11:
                    curRow = 13;
                    break;
                case 12:
                case 13:
                    curRow = 3;
                    break;
                case 3:
@@ -148,12 +148,12 @@
                    curRow = 9;
                    break;
                case 9:
                    curRow = 11;
                    curRow = 12;
                    break;
                case 11:
                    curRow = 13;
                case 12:
                    curRow = 14;
                    break;
                case 13:
                case 14:
                    curRow = 2;
                    break;
            }
@@ -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());
                }

            }