#检料盘点工作档更新

Junjie

2023-12-21 f8adb8fbfbf9c52cf412ef4ac5742b3e5fe76748

#检料盘点工作档更新

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

@@ -284,6 +284,7 @@
            }
        }

        ArrayList<String> outerLocs = new ArrayList<>();
        //检测是否为浅库位
        boolean sign=false;
        String th = "";
@@ -301,17 +302,32 @@
                    LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", outerLoc));
                    if (locMast != null) {
                        if (!locMast.getLocSts().equals("O") && !locMast.getLocSts().equals("R")) {
                            sign = true;
                            th = "库位号：" + locNo + " 浅库位有非空库位！";
                            break;
//                            sign = true;
//                            th = "库位号：" + locNo + " 浅库位有非空库位！";
//                            break;

                            OutLocDto outLocDto = new OutLocDto();
                            outLocDto.setLocNo(locMast.getLocNo());
                            List<LocDetlDto> locDetlDtos1 = new ArrayList<>();
                            for (LocDetl locDetl : locDetlService.selectByLocNo(locMast.getLocNo())) {
                                LocDetlDto locDetlDto = new LocDetlDto();
                                locDetlDto.setLocDetl(locDetl);
                                locDetlDto.setCount(locDetl.getAnfme());
                                locDetlDtos1.add(locDetlDto);
                            }
                            outLocDto.setLocDetlDtos(locDetlDtos1);
                            if (!outerLocs.contains(locMast.getLocNo())) {
                                dtos.add(outLocDto);
                                outerLocs.add(locMast.getLocNo());
                            }
                        }
                    }
                }
            }
        }
        if (sign){
            throw new CoolException("出库失败；"+th);
        }
//        if (sign){
//            throw new CoolException("出库失败；"+th);
//        }

        //**************325、331、333、339站点额外逻辑代码**************
        HashMap<String, Object> tmpMap = new HashMap<>();

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

@@ -46,31 +46,21 @@
        if (Cools.isEmpty(ioType, locNo)) {
            return 100.0D;
        }
        if (ioType != 11) {
            // 入库
            if (ioType < 100) {
                List<String> groupInnerLoc = Utils.getGroupInnerLoc(locNo);
                if (!Cools.isEmpty(groupInnerLoc)) {
                    for (String innerLoc : groupInnerLoc) {
                        WrkMast wrkMast = this.baseMapper.selectByLocNoOfPakin(innerLoc);
                        if (wrkMast != null) {
                            defaultIoPri = wrkMast.getIoPri() - 2;
                        }
                    }
                }
            // 出库
            } else {
                List<String> groupOuterLoc = Utils.getGroupOuterLoc(locNo);
                if (!Cools.isEmpty(groupOuterLoc)) {
                    for (String outerLoc : groupOuterLoc) {
                        WrkMast wrkMast = this.baseMapper.selectBySourceLocNoOfPakout(outerLoc);
                        if (wrkMast != null) {
                            defaultIoPri = wrkMast.getIoPri() - 2;
                        }
                    }
                }
            }
        int row = Utils.getRow(locNo);
        if (row == 6) {
            return 101D;
        }

        if (row == 13) {
            return 103D;
        }
        if (row == 14) {
            return 102D;
        }
        if (row == 15) {
            return 101D;
        }

        return defaultIoPri == null ? 100.0D : defaultIoPri;
    }