#

1

4 天以前 40ada0315f79eaaa30dce2f246878b3ea0d7493b

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

@@ -166,10 +166,10 @@
            int[] params = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber);
            curRow = params[1];
            int crnNo = params[2];
            if (!basCrnpService.checkSiteError(crnNo, true)) {
                attempt++;
                continue;
            }
//            if (!basCrnpService.checkSiteError(crnNo, true)) {
//                attempt++;
//                continue;
//            }
            int rowCount = params[0];
            int nearRow = params[3];

@@ -1007,7 +1007,7 @@
        //此程序用于优化堆垛机异常时的运行时间
        int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber);
        curRow = locNecessaryParameters[1];
        crnNo = locNecessaryParameters[2];
        crnNo = 6;
        rowCount = locNecessaryParameters[0];
        nearRow = locNecessaryParameters[3];

@@ -1015,7 +1015,7 @@
        StaDesc staDesc = null;
        BasDevp staNo = null;

        if (Utils.BooleanWhsTypeSta(rowLastno, staDescId)) {
//        if (Utils.BooleanWhsTypeSta(rowLastno, staDescId)) {
            // 获取目标站
//            wrapper = new EntityWrapper<StaDesc>()
//                    .eq("type_no", staDescId)
@@ -1036,7 +1036,7 @@
//                }
//                startupDto.setStaNo(staNo.getDevNo());
//            }
        }
//        }

        // 更新库位排号
        if (Utils.BooleanWhsTypeSta(rowLastno, staDescId) && Cools.isEmpty(locMast)) {
@@ -1047,7 +1047,7 @@
        // 开始查找库位 ==============================>>

        // 1.按规则查找库位
        if (Cools.isEmpty(locMast) && crnNo != 0) {
        if (Cools.isEmpty(locMast) && sourceStaNo != 4006) {
            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                    .eq("row1", nearRow)
                    .eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
@@ -1066,6 +1066,11 @@
                }
            }
        }
//        else{
//            if(findLocNoAttributeVo.getOutArea() == 1){
//
//            }
//        }

        // 递归查询
        if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {