#

lsh

2024-05-21 9a0d024ef76899b1721d82739fa66f9b528efc85

#

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -1459,7 +1459,7 @@
                                case 3:
                                case 4:
                                case 5:
                                    break;
                                    continue;
                                default:
                                    this.crnStnToLoc1(crn, crnProtocol,1); //  入库
                            }
@@ -1473,7 +1473,7 @@
                                case 3:
                                case 4:
                                case 5:
                                    break;
                                    continue;
                                default:
                                    this.locToCrnStn1(crn, crnProtocol,1); //  出库
                            }
@@ -1491,7 +1491,7 @@
                                case 3:
                                case 4:
                                case 5:
                                    break;
                                    continue;
                                default:
                                    this.locToCrnStn1(crn, crnProtocol,1); //  出库
                            }
@@ -1505,7 +1505,7 @@
                                case 3:
                                case 4:
                                case 5:
                                    break;
                                    continue;
                                default:
                                    this.crnStnToLoc1(crn, crnProtocol,1); //  入库
                            }
@@ -1572,7 +1572,7 @@
                                    this.crnStnToLoc1(crn, crnProtocol, sign[1]); //  入库
                                    break;
                                default:
                                    break;
                                    continue;
                            }
                            crnProtocol.setLastIo("O");
                        } else if (basCrnp.getOutEnable().equals("Y")) {
@@ -1583,7 +1583,7 @@
                                    this.locToCrnStn1(crn, crnProtocol, sign[1]); //  出库
                                    break;
                                default:
                                    break;
                                    continue;
                            }
                            crnProtocol.setLastIo("I");
                        }
@@ -1598,7 +1598,7 @@
                                    this.locToCrnStn1(crn, crnProtocol, sign[1]); //  出库
                                    break;
                                default:
                                    break;
                                    continue;
                            }
                            crnProtocol.setLastIo("I");
                        } else if (basCrnp.getInEnable().equals("Y")) {
@@ -1609,7 +1609,7 @@
                                    this.crnStnToLoc1(crn, crnProtocol, sign[1]); //  入库
                                    break;
                                default:
                                    break;
                                    continue;
                            }
                            crnProtocol.setLastIo("O");
                        }

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

@@ -60,26 +60,36 @@
    }

    /**
     * 判断是否为浅库位
     * 判断是否为浅库位  并存在深库位
     */
    public static boolean isShallowLoc(SlaveProperties slaveProperties, String locNo){
    public static boolean isShallowLoc(SlaveProperties slaveProperties, String locNo) {
        if (slaveProperties.isDoubleDeep()) {
            int row = getRow(locNo);
            return !slaveProperties.getDoubleLocs().contains(row);
        } else {
            return false;
            if (!slaveProperties.getDoubleLocs().contains(row)){
                boolean deepLocLeft = isDeepLocLeft(slaveProperties, row-1);//判断是否为左浅库位
                if (deepLocLeft){
                    return true;
                }
                return isDeepLocRight(slaveProperties, row+1);//判断是否为右浅库位
            }
        }
        return false;
    }

    /**
     * 判断是否为浅库位
     */
    public static boolean isShallowLoc(SlaveProperties slaveProperties, Integer row){
    public static boolean isShallowLoc(SlaveProperties slaveProperties, Integer row) {
        if (slaveProperties.isDoubleDeep()) {
            return !slaveProperties.getDoubleLocs().contains(row);
        } else {
            return false;
            if (!slaveProperties.getDoubleLocs().contains(row)){
                boolean deepLocLeft = isDeepLocLeft(slaveProperties, row-1);//判断是否为左浅库位
                if (deepLocLeft){
                    return true;
                }
                return isDeepLocRight(slaveProperties, row+1);//判断是否为右浅库位
            }
        }
        return false;
    }

    /**
@@ -87,8 +97,8 @@
     */
    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);
        boolean deepLocLeft = isDeepLocLeft(slaveProperties, row);//判断是否为左深库位
        int shallowRow = deepLocLeft? (row + 1) : (row - 1);
        return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
    }

@@ -96,41 +106,72 @@
     * 获取 深库位排对应的浅库位排
     */
    public static Integer getShallowRow(SlaveProperties slaveProperties, Integer deepRow) {
        int remainder = (int) Arith.remainder(deepRow, slaveProperties.getGroupCount());
        return remainder == 1 ? (deepRow + 1) : (deepRow - 1);
//        int remainder = (int) Arith.remainder(deepRow, slaveProperties.getGroupCount());
//        return remainder == 1 ? (deepRow + 1) : (deepRow - 1);
        boolean deepLocLeft = isDeepLocLeft(slaveProperties, deepRow);//判断是否为左深库位
        return deepLocLeft ? (deepRow + 1) : (deepRow - 1);
    }

    /**
     * 判断是否为左深库位
     */
    public static boolean isDeepLocLeft(SlaveProperties slaveProperties, Integer row) {
        if (slaveProperties.isDoubleDeep()) {
            return slaveProperties.getDoubleLocsLeft().contains(row);
        } else {
            return false;
        }
    }


    /**
     * 判断是否为右深库位
     */
    public static boolean isDeepLocRight(SlaveProperties slaveProperties, Integer row) {
        if (slaveProperties.isDoubleDeep()) {
            return slaveProperties.getDoubleLocsRight().contains(row);
        } else {
            return false;
        }
    }

    /**
     * 获取 浅库位对应的深库位号
     */
    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);
        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);
        boolean deepLocLeft = isDeepLocLeft(slaveProperties, row-1);//判断是否为左浅库位
        int shallowRow = deepLocLeft? (row - 1) : (row + 1);
        return zerofill(String.valueOf(shallowRow), 2) + shallowLoc.substring(2);
    }

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

    /**

 src/main/java/com/zy/core/properties/SlaveProperties.java

@@ -28,6 +28,8 @@
    private boolean doubleDeep;

    private List<Integer> doubleLocs = new ArrayList<>();
    private List<Integer> doubleLocsLeft = new ArrayList<>();
    private List<Integer> doubleLocsRight = new ArrayList<>();

    private int groupCount;


 src/main/resources/application.yml

@@ -8,7 +8,7 @@
    name: @pom.build.finalName@
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=ahyxasrs
    url: jdbc:sqlserver://10.10.10.254:1433;databasename=ahyxasrs
    username: sa
    password: sa@123
  mvc:
@@ -44,9 +44,13 @@
  # 双深
  doubleDeep: true
  # 双深库位排号
  doubleLocs: 1,4,5,8,9,12,13,16,17,20,21,24
  doubleLocs: 1,4,5,8,21,24,27
  # 一个堆垛机负责的货架排数
  groupCount: 4
  # 左深库位排号
  doubleLocsLeft: 1,5,21
  # 右深库位排号
  doubleLocsRight: 4,8,24,27
  # 堆垛机1
  crn[0]:
    id: 1
@@ -102,7 +106,7 @@
  # 堆垛机3
  crn[2]:
    id: 3
    ip: 10.10.10.120
    ip: 10.10.10.140
    port: 102
    rack: 0
    slot: 0
@@ -128,7 +132,7 @@
  # 堆垛机4
  crn[3]:
    id: 4
    ip: 10.10.10.120
    ip: 10.10.10.150
    port: 102
    rack: 0
    slot: 0
@@ -154,7 +158,7 @@
  # 堆垛机5
  crn[4]:
    id: 5
    ip: 10.10.10.120
    ip: 10.10.10.160
    port: 102
    rack: 0
    slot: 0
@@ -189,18 +193,18 @@
    demo: false
    # 堆垛机入库站点
    crnInStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 153
      staNoOther: 152
      row: 4
      devpPlcId: ${wcs-slave.devp[1].id}
      staNo: 413
      staNoOther: 413
      row: 23
      bay: 1
      lev: 1
    # 堆垛机出库站点
    crnOutStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 100
      staNoOther: 101
      row: 1
      devpPlcId: ${wcs-slave.devp[1].id}
      staNo: 415
      staNoOther: 415
      row: 22
      bay: 1
      lev: 1
  # 堆垛机7
@@ -215,18 +219,18 @@
    demo: false
    # 堆垛机入库站点
    crnInStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 153
      staNoOther: 152
      row: 4
      devpPlcId: ${wcs-slave.devp[1].id}
      staNo: 405
      staNoOther: 405
      row: 26
      bay: 1
      lev: 1
    # 堆垛机出库站点
    crnOutStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 100
      staNoOther: 101
      row: 1
      devpPlcId: ${wcs-slave.devp[1].id}
      staNo: 407
      staNoOther: 407
      row: 25
      bay: 1
      lev: 1
  # RGV穿梭车1
@@ -277,6 +281,9 @@
    # 小料箱 双工位单伸 空板入库口1
    emptyInSingleSta[0]:
      staNo: 104
    # 小料箱 双工位单伸 空板入库口1
    emptyInSingleSta[1]:
      staNo: 173
    # 大料箱 双工位单伸 入库口1
    inLargeSta[0]:
      staNo: 153