#

lfdMem

2025-03-10 ba8d5c8630cf85ced6b4615466140956f1f70764

#

 license.lic

Binary files differ

 src/main/java/com/zy/asrs/controller/MobileController.java

@@ -213,9 +213,10 @@
    }

    @RequestMapping("/comb/auth")
    @ManagerAuth(memo = "组托")
//    @ManagerAuth(memo = "组托")
    public R comb(@RequestBody CombParam combParam){
        mobileService.comb(combParam, getUserId());
//        mobileService.comb(combParam, getUserId());
        mobileService.comb(combParam, 9999L);
        return R.ok("组托成功");
    }


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

@@ -123,9 +123,17 @@
     */
    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);
        return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
        boolean deepLocLeft = isDeepLocLeft(slaveProperties, row);
        boolean deepLocRight = isDeepLocRight(slaveProperties, row);
        int targetRow;
        if (deepLocLeft) {
            targetRow = row + 1;
        } else if (deepLocRight) {
            targetRow = row - 1;
        } else {
            throw new RuntimeException(deepLoc + "不是浅库位，系统繁忙");
        }
        return zerofill(String.valueOf(targetRow), 2) + deepLoc.substring(2);
    }

    /**
@@ -141,30 +149,45 @@
     */
    public static String getDeepLoc(SlaveProperties slaveProperties, String shallowLoc) {
        int row = getRow(shallowLoc);
        int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
        boolean deepLocLeft = isDeepLocLeft(slaveProperties, row-1);
        boolean deepLocRight = isDeepLocRight(slaveProperties, row+1);
        int targetRow;
        if (remainder == 2) {
        if (deepLocLeft) {
            targetRow = row - 1;
        } else if (remainder == 3) {
        } else if (deepLocRight) {
            targetRow = row + 1;
        } else {
            throw new RuntimeException(shallowLoc + "不是浅库位，系统繁忙");
        }
        return zerofill(String.valueOf(targetRow), 2) + shallowLoc.substring(2);
    }
//    public static String getDeepLoc(SlaveProperties slaveProperties, String shallowLoc) {
//        int row = getRow(shallowLoc);
//        int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
//        int targetRow;
//        if (remainder == 2) {
//            targetRow = row - 1;
//        } else if (remainder == 3) {
//            targetRow = row + 1;
//        } else {
//            throw new RuntimeException(shallowLoc + "不是浅库位，系统繁忙");
//        }
//        return zerofill(String.valueOf(targetRow), 2) + shallowLoc.substring(2);
//    }

    /**
     * 获取 浅库位排对应的深库位排
     */
    public static Integer getDeepRow(SlaveProperties slaveProperties, Integer shallowRow) {
        int remainder = (int) Arith.remainder(shallowRow, slaveProperties.getGroupCount());
        boolean deepLocLeft = isDeepLocLeft(slaveProperties, shallowRow-1);
        boolean deepLocRight = isDeepLocRight(slaveProperties, shallowRow+1);
        int targetRow;
        if (remainder == 2) {
        if (deepLocLeft) {
            targetRow = shallowRow - 1;
        } else if (remainder == 3) {
        } else if (deepLocRight) {
            targetRow = shallowRow + 1;
        } else {
            throw new RuntimeException(shallowRow + "不是浅库位排，系统繁忙");
            throw new RuntimeException(shallowRow + "不是浅库位，系统繁忙");
        }
        return targetRow;
    }

 src/main/resources/application.yml

@@ -10,10 +10,10 @@
    enabled: false
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
#    url: jdbc:sqlserver://192.168.4.191:1433;databasename=integrationasrs
#    url: jdbc:sqlserver://127.0.0.1:1433;databasename=lfdasrsMem
#    username: sa
#    password: sa@123
    url: jdbc:sqlserver://192.168.4.191:50948;databasename=source
    url: jdbc:sqlserver://192.168.0.17:1433;databasename=lfdasrsMem
    username: sa
    password: sa@123
#    url: jdbc:sqlserver://127.0.0.1:51433;databasename=source
@@ -45,7 +45,7 @@

#License相关配置
license:
  subject: integrationasrs
  subject: lfdasrsMem
  publicAlias: publicCert
  storePass: public_zhongyang_123456789
  licensePath: license.lic

 src/main/resources/license.lic

Binary files differ