1

zhangc

2025-04-18 f9a7ddfa09e2f31b40e10af5472f3fb1a6fd5e0b

 src/main/java/com/zy/asrs/utils/Utils.java

@@ -40,7 +40,7 @@

        map.put(3010,"堆垛机库南三楼出入库口");map.put(3012,"堆垛机库南三楼出库口");

        return map.get(sta);
        return map.get(sta)==null?sta.toString():map.get(sta);
    }

    public static boolean isNorth(Integer sourceStaNo){
@@ -146,7 +146,7 @@
    public static String getShallowLoc(SlaveProperties slaveProperties, String deepLoc) {
        int row = getRow(deepLoc);
        int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
        int shallowRow = remainder == 1 ? (row + 1) : (row - 1);
        int shallowRow = remainder == 1 ? (row - 1) : (row + 1);
        return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
    }

@@ -355,6 +355,7 @@
                }
            }
        }

        return necessaryParameters;
    }

@@ -529,32 +530,22 @@
            case 1:
                necessaryParameters[1] = 4;    //curRow   最深库位排
                necessaryParameters[2] = sCrnNo;     //crnNo     堆垛机号
                necessaryParameters[3] = 6;    //nearRow  最浅库位排
                necessaryParameters[3] = 3;    //nearRow  最浅库位排
                break;
            case 4:
                necessaryParameters[1] = 7;    //curRow   最深库位排
                necessaryParameters[1] = 5;    //curRow   最深库位排
                necessaryParameters[2] = sCrnNo;     //crnNo     堆垛机号
                necessaryParameters[3] = 7;    //nearRow  最浅库位排
                necessaryParameters[3] = 6;    //nearRow  最浅库位排
                break;
            case 7:
                necessaryParameters[1] = 9;    //curRow   最深库位排
            case 5:
                necessaryParameters[1] = 8;    //curRow   最深库位排
                necessaryParameters[2] = sCrnNo;     //crnNo     堆垛机号
                necessaryParameters[3] = 11;    //nearRow  最浅库位排
                necessaryParameters[3] = 8;    //nearRow  最浅库位排
                break;
            case 9:
                necessaryParameters[1] = 12;    //curRow   最深库位排
                necessaryParameters[2] = sCrnNo;     //crnNo     堆垛机号
                necessaryParameters[3] = 12;    //nearRow  最浅库位排
                break;
            case 12:
                necessaryParameters[1] = 14;    //curRow   最深库位排
                necessaryParameters[2] = sCrnNo;     //crnNo     堆垛机号
                necessaryParameters[3] = 14;    //nearRow  最浅库位排
                break;
            case 14:
            case 8:
                necessaryParameters[1] = 1;    //curRow   最深库位排
                necessaryParameters[2] = sCrnNo;     //crnNo     堆垛机号
                necessaryParameters[3] = 2;    //nearRow  最浅库位排
                necessaryParameters[3] = 1;    //nearRow  最浅库位排
                break;
            default:
                throw new CoolException("库位排号异常：排号：" + curRow);