#

ytfl

4 天以前 cb985961bcfbd5d0c9191c914c2e268504659bfe

#

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

@@ -116,6 +116,9 @@
     */
    public static String getShallowLoc(SlaveProperties slaveProperties, String deepLoc) {
        int row = getRow(deepLoc);
        if (row ==1 || row == 6){
            return deepLoc;
        }
        boolean deepLocLeft = isDeepLocLeft(slaveProperties, row);//判断是否为左深库位
        int shallowRow = deepLocLeft ? (row + 1) : (row - 1);
        return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);

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

@@ -149,7 +149,7 @@
            }

        } catch (Exception e) {
            log.error("站点={} 未查询到对应的规则", sourceStaNo);
            log.error("站点={} 未查询到对应的规则，{}", sourceStaNo,e.getMessage());
        }
        return null;
    }
@@ -240,7 +240,7 @@
                List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                        .eq("row1", nearRow).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()));
                int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).eq("io_type", 1));
                if (locMasts.size() - crnCountO <= 2) {
                if (locMasts.size() - crnCountO <= 15) {
                    log.error(crnNo + "号堆垛机没有空库位！！！ 尺寸规格： {}， 轮询次数：{}", JSON.toJSONString(locTypeDto), times);
                    nearRow = 0;
                    times++;
@@ -293,7 +293,7 @@
                                    .eq("loc_type2", locTypeDto.getLocType2())
                            );
                            int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).eq("io_type", 1));
                            if (locMasts.size() - crnCountO <= 2) {
                            if (locMasts.size() - crnCountO <= 15) {
                                log.error(crnNo + "号堆垛机没有空库位！！！ 尺寸规格： {}， 轮询次数：{}", JSON.toJSONString(locTypeDto), times);
                            } else {
                                nearRow = near;
@@ -345,7 +345,7 @@
                                    .eq("loc_type2", locTypeDto.getLocType2())
                            );
                            int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).eq("io_type", 1));
                            if (locMasts.size() - crnCountO <= 2) {
                            if (locMasts.size() - crnCountO <= 15) {
                                log.error(crnNo + "号堆垛机没有空库位！！！ 尺寸规格： {}， 轮询次数：{}", JSON.toJSONString(locTypeDto), times);
                            } else {
                                nearRow = near;

 src/main/resources/application.yml

@@ -16,7 +16,7 @@
  task:
    scheduling:
      pool:
        size: 3
        size: 5


  mvc:
@@ -89,7 +89,7 @@
NYNC:
  ip: http://192.168.5.160
  port: 8088
  pageSize: 1000
  pageSize: 100
  #1.销售出库单参照发货单新增
  saveRefDelivery: /nccloud/api/ic/saleout/saveRefDelivery
  #2.其他入库单参照转库新增