#

LSH

2023-03-27 700059de6ffbe956e6546e74aac9a1f0cd6f2663

#

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

@@ -540,39 +540,7 @@
            int row = getRow(locNoKong);
            int bay = getBay(locNoKong);
            int lev = getLev(locNoKong);
            if (!(row==4 || row==5)){
                if (row>5){
                    locMasts=locMastService.selectList(new EntityWrapper<LocMast>().ge("row1", 5).le("row1", row)
                            .eq("bay1",bay).eq("lev1",lev));
                    for (LocMast locMast1:locMasts){
                        if (locMast1.getRow1()<row){
                            if (!locMast1.getLocSts().equals("O")){
                                if (param.getLocNos().contains(locMast1.getLocNo())){
                                    continue;
                                }
                                sign=true;
                                th="库位号："+locNoKong+" 浅库位有非空库位！";
                                break;
                            }
                        }
                    }
                }else {
                    locMasts=locMastService.selectList(new EntityWrapper<LocMast>().le("row1", 4).ge("row1", row)
                            .eq("bay1",bay).eq("lev1",lev));
                    for (LocMast locMast1:locMasts){
                        if (locMast1.getRow1()>row){
                            if (!locMast1.getLocSts().equals("O")){
                                if (param.getLocNos().contains(locMast1.getLocNo())){
                                    continue;
                                }
                                sign=true;
                                th="库位号："+locNoKong+" 浅库位有非空库位！";
                                break;
                            }
                        }
                    }
                }
            }

        }
        if (sign){
            throw new CoolException("出库失败；"+th);

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

@@ -49,7 +49,7 @@
        if (ioType != 11) {
            // 入库
            if (ioType < 100) {
                List<String> groupOuterLoc = Utils.getGroupOuterLoc(locNo);
                List<String> groupOuterLoc = Utils.getGroupOuterLocIoPri(locNo);
                if (!Cools.isEmpty(groupOuterLoc)) {
                    for (String outerLoc : groupOuterLoc) {
                        WrkMast wrkMast = this.baseMapper.selectByLocNoOfPakin(outerLoc);
@@ -71,7 +71,7 @@
                }
            // 出库
            } else {
                List<String> groupOuterLoc = Utils.getGroupOuterLoc(locNo);
                List<String> groupOuterLoc = Utils.getGroupInsideLoc(locNo);
                if (!Cools.isEmpty(groupOuterLoc)) {
                    for (String outerLoc : groupOuterLoc) {
                        WrkMast wrkMast = this.baseMapper.selectBySourceLocNoOfPakout(outerLoc);
@@ -81,7 +81,7 @@
                        }
                    }
                }
                List<String> groupInsideLoc = Utils.getGroupInsideLoc(locNo);
                List<String> groupInsideLoc = Utils.getGroupOuterLocIoPri(locNo);
                if (!Cools.isEmpty(groupInsideLoc)) {
                    for (String insideLoc : groupInsideLoc) {
                        WrkMast wrkMast = this.baseMapper.selectBySourceLocNoOfPakout(insideLoc);

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

@@ -183,6 +183,20 @@
            }
            return result;
        }
        if (CommonService.FIRST_GROUP_ROW_LIST_SHORT.contains(row)) {
            List<String> result = new ArrayList<>();
            for (Integer row0 : CommonService.FIRST_GROUP_ROW_LIST_SHORT) {
                result.add(zerofill(String.valueOf(row0), 2) + locNo.substring(2));
            }
            return result;
        }
        if (CommonService.THIRD_GROUP_ROW_LIST.contains(row)) {
            List<String> result = new ArrayList<>();
            for (Integer row0 : CommonService.THIRD_GROUP_ROW_LIST) {
                result.add(zerofill(String.valueOf(row0), 2) + locNo.substring(2));
            }
            return result;
        }
        throw new RuntimeException("库位解析异常");
    }

@@ -199,32 +213,15 @@
    }


    public static Integer getInnermostRow(String locNo){
        int row = getRow(locNo);
        switch (row) {
            case 1:
            case 2:
            case 3:
            case 4:
                return 1;
            case 5:
            case 6:
            case 7:
            case 8:
            case 9:
            case 10:
            case 11:
                return 11;
            default:
                throw new RuntimeException("库位解析异常");
        }
    }

    public static List<Integer> getGroupLoc(Integer row){
        if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
            return CommonService.FIRST_GROUP_ROW_LIST;
        } else if (CommonService.FIRST_GROUP_ROW_LIST_SHORT.contains(row)) {
            return CommonService.FIRST_GROUP_ROW_LIST_SHORT;
        } else if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
            return CommonService.SECOND_GROUP_ROW_LIST;
        } else if (CommonService.THIRD_GROUP_ROW_LIST.contains(row)) {
            return CommonService.THIRD_GROUP_ROW_LIST;
        } else {
            throw new RuntimeException("库位解析异常");
        }
@@ -279,6 +276,49 @@
        return result;
    }

    // 外侧方向的货位  优先入库方向/优先出库方向
    public static List<String> getGroupOuterLocIoPri(String locNo){
        int row = getRow(locNo);
        List<String> result = new ArrayList<>();
        if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
            for (Integer integer : CommonService.FIRST_GROUP_ROW_LIST) {
                if (integer < row) {
                    result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
                } else {
                    break;
                }
            }
        } else if (CommonService.FIRST_GROUP_ROW_LIST_SHORT.contains(row)){
            for (Integer integer : CommonService.FIRST_GROUP_ROW_LIST_SHORT) {
                if (integer < row) {
                    result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
                } else {
                    break;
                }
            }
        } else if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)){
            for (Integer integer : CommonService.SECOND_GROUP_ROW_LIST) {
                if (integer < row) {
                    result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
                } else {
                    break;
                }
            }
        } else if (CommonService.THIRD_GROUP_ROW_LIST.contains(row)){
            List<Integer> clone = Arrays.asList(new Integer[CommonService.THIRD_GROUP_ROW_LIST.size()]);
            Collections.copy(clone, CommonService.THIRD_GROUP_ROW_LIST);
            Collections.reverse(clone);
            for (Integer integer : clone) {
                if (integer > row) {
                    result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
                } else {
                    break;
                }
            }
        }
        return result;
    }

    public static void main(String[] args) {
        System.out.println(JSON.toJSONString(getGroupOuterLoc("0200101")));
    }
@@ -287,7 +327,29 @@
    public static List<String> getGroupInsideLoc(String locNo){
        int row = getRow(locNo);
        List<String> result = new ArrayList<>();
        if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
        if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
            List<Integer> clone = Arrays.asList(new Integer[CommonService.FIRST_GROUP_ROW_LIST.size()]);
            Collections.copy(clone, CommonService.FIRST_GROUP_ROW_LIST);
            Collections.reverse(clone);
            for (Integer integer : clone) {
                if (integer > row) {
                    result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
                } else {
                    break;
                }
            }
        } else if (CommonService.FIRST_GROUP_ROW_LIST_SHORT.contains(row)) {
            List<Integer> clone = Arrays.asList(new Integer[CommonService.FIRST_GROUP_ROW_LIST_SHORT.size()]);
            Collections.copy(clone, CommonService.FIRST_GROUP_ROW_LIST_SHORT);
            Collections.reverse(clone);
            for (Integer integer : clone) {
                if (integer > row) {
                    result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
                } else {
                    break;
                }
            }
        } else if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
            List<Integer> clone = Arrays.asList(new Integer[CommonService.SECOND_GROUP_ROW_LIST.size()]);
            Collections.copy(clone, CommonService.SECOND_GROUP_ROW_LIST);
            Collections.reverse(clone);
@@ -298,8 +360,8 @@
                    break;
                }
            }
        } else if (CommonService.FIRST_GROUP_ROW_LIST.contains(row)) {
            for (Integer integer : CommonService.FIRST_GROUP_ROW_LIST) {
        } else if (CommonService.THIRD_GROUP_ROW_LIST.contains(row)) {
            for (Integer integer : CommonService.THIRD_GROUP_ROW_LIST) {
                if (integer < row) {
                    result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
                } else {
@@ -319,8 +381,8 @@
    public static List<String> getGroupOutsideLoc(String locNo){
        int row = getRow(locNo);
        List<String> result = new ArrayList<>();
        if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
            for (Integer integer : CommonService.SECOND_GROUP_ROW_LIST) {
        if (CommonService.THIRD_GROUP_ROW_LIST.contains(row)) {
            for (Integer integer : CommonService.THIRD_GROUP_ROW_LIST) {
                if (integer < row) {
                    result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
                } else {
@@ -338,6 +400,28 @@
                    break;
                }
            }
        } else if (CommonService.FIRST_GROUP_ROW_LIST_SHORT.contains(row)) {
            List<Integer> clone = Arrays.asList(new Integer[CommonService.FIRST_GROUP_ROW_LIST_SHORT.size()]);
            Collections.copy(clone, CommonService.FIRST_GROUP_ROW_LIST_SHORT);
            Collections.reverse(clone);
            for (Integer integer : clone) {
                if (integer > row) {
                    result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
                } else {
                    break;
                }
            }
        } else if (CommonService.SECOND_GROUP_ROW_LIST.contains(row)) {
            List<Integer> clone = Arrays.asList(new Integer[CommonService.SECOND_GROUP_ROW_LIST.size()]);
            Collections.copy(clone, CommonService.SECOND_GROUP_ROW_LIST);
            Collections.reverse(clone);
            for (Integer integer : clone) {
                if (integer > row) {
                    result.add(zerofill(String.valueOf(integer), 2) + locNo.substring(2));
                } else {
                    break;
                }
            }
        } else {
//            throw new RuntimeException("库位解析异常");
        }

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

@@ -151,17 +151,31 @@

        // 靠近摆放规则 --- 空托
        if (staDescId == 10) {
            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                    .eq("loc_sts", "D"));
            if (locMasts.size() > 0) {
                for (LocMast loc : locMasts) {
                    LocMast locMast0 = locMastService.findNearloc(loc.getLocNo());
                    if (null != locMast0) {
                        // 浅库位符合尺寸检测
                        if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
                            locMast = locMast0;
                            break;
            //先判断工作档，查找主档IOType=1， wrkSts < 10的工作明细，料号相同的明细库位
            List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("io_type",10));
            for (WrkMast wrkMast : wrkMasts) {
                LocMast locMast0 = locMastService.findNearloc(wrkMast.getLocNo());
                if (null != locMast0) {
                    // 浅库位符合尺寸检测
                    if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
                        locMast = locMast0;
                        break;
                    }
                }
            }
            if (Cools.isEmpty(locMast)){
                List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                        .eq("loc_sts", "D"));
                if (locMasts.size() > 0) {
                    for (LocMast loc : locMasts) {
                        LocMast locMast0 = locMastService.findNearloc(loc.getLocNo());
                        if (null != locMast0) {
                            // 浅库位符合尺寸检测
                            if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
                                locMast = locMast0;
                                break;

                            }
                        }
                    }
                }
@@ -194,8 +208,7 @@
                List<String> groupInsideLoc = Utils.getGroupInsideLoc(peakLoc.getLocNo());
                if (!Cools.isEmpty(groupInsideLoc)){
                    if (!locMastService.checkAllLocEmpty(groupInsideLoc)) continue;
                    locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
                            .eq("loc_no", groupInsideLoc.get(0)));
                    locMast = peakLoc;
                    break;
                }else {
                    locMast=peakLoc;
@@ -206,22 +219,8 @@

        // 2.库位当前所属尺寸无空库位时，调整尺寸参数，向上兼容检索库位
        if (Cools.isEmpty(locMast)) {
            List<LocMast> peakLocs = locMastService.selectAllPeakLoc();
            for (LocMast peakLoc : peakLocs) {
                List<String> groupOuterLoc = Utils.getGroupInsideLoc(peakLoc.getLocNo());
                if (!Cools.isEmpty(groupOuterLoc)){
                    if (!locMastService.checkAllLocEmpty(groupOuterLoc)) continue;
                    locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
                            .eq("loc_no", groupOuterLoc.get(0)));
                }else {
                    locMast = peakLoc;
                }

            }
            if (Cools.isEmpty(locMast)) {
                log.error("系统没有空库位！！！ 尺寸规格： {}， 轮询次数：{}", JSON.toJSONString(locTypeDto), times);
                throw new CoolException("没有空库位");
            }
            log.error("系统没有空库位！！！ 尺寸规格： {}， 轮询次数：{}", JSON.toJSONString(locTypeDto), times);
            throw new CoolException("没有空库位");
        }
        String locNo = locMast.getLocNo();