#

luxiaotao1123

2022-08-31 c65c2b5254add3b6975365df0be350cc99deae8c

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

@@ -10,7 +10,6 @@
import com.zy.asrs.utils.Utils;
import com.zy.asrs.utils.VersionUtils;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.Shelves;
import com.zy.common.model.StartupDto;
import com.zy.common.properties.SlaveProperties;
import lombok.extern.slf4j.Slf4j;
@@ -185,31 +184,31 @@
        if (null == locMast) {
            switch (whsType) {
                case 1:
                    if (curRow == 1) {
                        curRow = 7;
                    } else if (curRow == 7) {
                        curRow = 1;
                    }
                    crnNo = 1;
                    break;
                case 2:
                    if (curRow == 8) {
                        curRow = 14;
                    } else if (curRow == 14) {
                        curRow = 8;
                    }
                    crnNo = 2;
                    break;
                case 3:
                    if (curRow == 15) {
                        curRow = 21;
                    } else if (curRow == 21) {
                        curRow = 15;
                    }
                    crnNo = 3;
                    break;
                default:
                    throw new CoolException("检索库位失败，请联系管理员");
            }
            Shelves shelves = new Shelves(rowCount, crn_qty);
            for (int i = 0; i < shelves.group; i ++) {
                curRow = shelves.start(curRow);
                if (curRow < 0) {
                    throw new CoolException("检索库位失败，请联系管理员");
                }
                Integer crnNo1 = shelves.get(curRow) + 1;
                if (whsType != 1) {
                    crnNo1 = whsType;
                }
                if (basCrnpService.checkSiteError(crnNo1, true)) {
                    crnNo = crnNo1;
                    break;
                }
            }
        }

@@ -244,23 +243,7 @@

        // 1.当检索库排为浅库位排时，优先寻找当前库排的深库位排
        if (locMast == null) {
            List<Integer> rows;
            if (whsType == 2) {
                rows = FIRST_GROUP_ROW_LIST;
            } else if (whsType == 3) {
                rows = SECOND_GROUP_ROW_LIST;
            } else {
                switch (curRow) {
                    case 1:
                        rows = FIRST_GROUP_ROW_LIST;
                        break;
                    case 2:
                        rows = SECOND_GROUP_ROW_LIST;
                        break;
                    default:
                        throw new CoolException("入库逻辑故障【" + curRow + "】");
                }
            }
            List<Integer> rows = Utils.getGroupLoc(curRow);

            locMast = locMastService.queryFreeLocMast(null, rows, locTypeDto.getLocType1());
            // 因库位移转、需预留空库位