#

zjj

2025-03-30 0031e41fb8dd0367c9d6237deda6ca7091523f68

#

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

@@ -165,10 +165,10 @@
        int row = getRow(shallowLoc);
        int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
        int targetRow;
        if (remainder == 2) {
            targetRow = row - 1;
        } else if (remainder == 3) {
        if (remainder == 0  ) {
            targetRow = row + 1;
        } else if (remainder == 3) {
            targetRow = row - 1;
        } else {
            throw new RuntimeException(shallowLoc + "不是浅库位，系统繁忙");
        }
@@ -355,6 +355,10 @@
                }
            }
        }

        //堆垛机库位从14排开始
        necessaryParameters[1] = necessaryParameters[1]+13;    //curRow   最深库位排
        necessaryParameters[3] = necessaryParameters[3]+13;    //nearRow  最浅库位排
        return necessaryParameters;
    }


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

@@ -362,7 +362,7 @@
            }
            // 更新库位排号
            if (Cools.isEmpty(locMast)){
                rowLastno.setCurrentRow(curRow);
                rowLastno.setCurrentRow((curRow-13));
                rowLastnoService.updateById(rowLastno);
            }
        }
@@ -372,17 +372,12 @@
        // 1.按规则查找库位
        if (Cools.isEmpty(locMast) && crnNo != 0) {
            List<LocMast> locMasts = null;
            if (Utils.isNorth(sourceStaNo)){
                locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                        .eq("row1", nearRow)
                        .eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue())
                        .orderBy("lev1",true).orderBy("bay1",false));
            }else {

                locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                        .eq("row1", nearRow)
                        .eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue())
                        .orderBy("lev1",true).orderBy("bay1",true));
            }


            for (LocMast locMast1 : locMasts) {
                if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {

 src/main/resources/application.yml

@@ -50,13 +50,13 @@
  # 双深
  doubleDeep: true
  # 双深库位排号
  doubleLocs: 1,4,5,8
  doubleLocs: 14,17
  # 一个堆垛机负责的货架排数
  groupCount: 4
  # 左深库位排号
  doubleLocsLeft: 1,5,9,13
  doubleLocsLeft: 14
  # 右深库位排号
  doubleLocsRight: 4,8,12,16
  doubleLocsRight: 17
# wms参数配置
wms-parameter:
  # 自动补空板功能开关