#

LSH

2023-03-27 b50a2e2df1c0fab844dc194ae58f01cf906e32b8

#

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

@@ -162,45 +162,29 @@
    public void startupFullTakeStore(StockOutParam param, Long userId) {
        ArrayList<String> locNos = new ArrayList<>();
        for (StockOutParam.LocDetl locDetl:param.getLocDetls()){
            locNos.add(locDetl.getLocNo());
            if (!locNos.contains(locDetl.getLocNo())){
                locNos.add(locDetl.getLocNo());
            }
        }
        //检测是否为浅库位
        List<LocMast> locMasts = null;
        boolean sign=false;
        String th = "";
        for (StockOutParam.LocDetl locDetl:param.getLocDetls()){
            int row = getRow(locDetl.getLocNo());
            int bay = getBay(locDetl.getLocNo());
            int lev = getLev(locDetl.getLocNo());
            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 (locNos.contains(locMast1.getLocNo())){
                            continue;
                        }
                        if (locMast1.getRow1()<row){
                            if (!locMast1.getLocSts().equals("O")){
                                sign=true;
                                th="库位号："+locDetl.getLocNo()+" 浅库位有非空库位！";
                                break;
                            }
                        }
        for (String locNo:locNos){
            if (sign){
                break;
            }
            List<String> groupInsideLoc = Utils.getGroupInsideLoc(locNo);
            if (!Cools.isEmpty(groupInsideLoc)) {
                for (String insideLoc : groupInsideLoc) {
                    if (locNos.contains(insideLoc)){
                        continue;
                    }
                }else {
                    locMasts=locMastService.selectList(new EntityWrapper<LocMast>().le("row1", 4).ge("row1", row)
                            .eq("bay1",bay).eq("lev1",lev));
                    for (LocMast locMast1:locMasts){
                        if (locNos.contains(locMast1.getLocNo())){
                            continue;
                        }
                        if (locMast1.getRow1()>row){
                            if (!locMast1.getLocSts().equals("O")){
                                sign=true;
                                th="库位号："+locDetl.getLocNo()+" 浅库位有非空库位！";
                                break;
                            }
                    LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", insideLoc));
                    if (locMast != null) {
                        if (!locMast.getLocSts().equals("O") && !locMast.getLocSts().equals("R")){
                            sign=true;
                            th="库位号："+locNo+" 浅库位有非空库位！";
                            break;
                        }
                    }
                }
@@ -532,15 +516,30 @@
    @Override
    @Transactional
    public void emptyPlateOut(EmptyPlateOutParam param, Long userId) {
        List<String> locNos = param.getLocNos();
        //检测是否为浅库位
        List<LocMast> locMasts = null;
        boolean sign=false;
        String th = "";
        for (String locNoKong: param.getLocNos()){
            int row = getRow(locNoKong);
            int bay = getBay(locNoKong);
            int lev = getLev(locNoKong);

        for (String locNo:locNos){
            if (sign){
                break;
            }
            List<String> groupInsideLoc = Utils.getGroupInsideLoc(locNo);
            if (!Cools.isEmpty(groupInsideLoc)) {
                for (String insideLoc : groupInsideLoc) {
                    if (locNos.contains(insideLoc)){
                        continue;
                    }
                    LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", insideLoc));
                    if (locMast != null) {
                        if (!locMast.getLocSts().equals("O") && !locMast.getLocSts().equals("R")){
                            sign=true;
                            th="库位号："+locNo+" 浅库位有非空库位！";
                            break;
                        }
                    }
                }
            }
        }
        if (sign){
            throw new CoolException("出库失败；"+th);

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

@@ -77,6 +77,7 @@
                        WrkMast wrkMast = this.baseMapper.selectBySourceLocNoOfPakout(outerLoc);
                        if (wrkMast != null) {
                            defaultIoPri = wrkMast.getIoPri() - 2;
                            break;
//                            defaultIoPri = defaultIoPri == null ? wrkMast.getIoPri() - 2 : defaultIoPri - 2;
                        }
                    }