#

zjj

2024-08-23 973590171b483627b9e5c556302c02000fd666fc

#

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

@@ -173,6 +173,17 @@
        }
        if (!locDetlDtos.isEmpty()) {
            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));
            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                    .eq("lev1", locMast.getLev1())
                    .orderBy("bay1",false));
            for (LocMast locMast1 : locMasts) {
                if (locMast1.getLocNo().equals(locMast.getLocNo())) {
                    break;
                }
                if (locMast1.getLocSts().equals("D") || locMast1.getLocSts().equals("F")) {
                    throw new CoolException(locMast.getLocNo()+"库位堵塞，禁止出库");
                }
            }
            if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D") ){
                // 启动出库开始 101.出库
                stockOut(staNo, locDetlDtos, null, userId);
@@ -443,6 +454,17 @@
            if (!locMast.getLocSts().equals("D")){
                throw new CoolException("所选库位存在状态不为D的库位，库位号："+locMast.getLocNo()+" 、当前状态："+locMast.getLocSts()+"-"+locMast.getLocSts$());
            }
            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                    .eq("lev1", locMast.getLev1())
                    .orderBy("bay1",false));
            for (LocMast locMast1 : locMasts) {
                if (locMast1.getLocNo().equals(locMast.getLocNo())) {
                    break;
                }
                if (locMast1.getLocSts().equals("D") || locMast1.getLocSts().equals("F")) {
                    throw new CoolException(locNo+"库位堵塞，禁止出库");
                }
            }
            // 获取源站
            Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                    .eq("type_no", 110)

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

@@ -484,7 +484,9 @@
                        }
                        for (LocMast locMast2 : locMasts) {
                            if (locMast2.getLocSts().equals("O") ) {
                                locMast = locMast2;
                                if (locMast == null){
                                    locMast = locMast2;
                                }
                            }else if (locMast2.getLocSts().equals("F")){
                                locMast = null;
                            }
@@ -526,7 +528,9 @@
                    }
                    for (LocMast locmast3 : locMasts) {
                        if (locmast3.getLocSts().equals("O")){
                            locMast = locmast3;
                            if (locMast == null){
                                locMast = locmast3;
                            }
                        }else if (locmast3.getLocSts().equals("F")){
                            locMast = null;
                        }
@@ -544,7 +548,9 @@
            }
            for (LocMast locmast : locMasts) {
                if (locmast.getLocSts().equals("O") ) {
                    locMast = locmast;
                    if (locMast == null){
                        locMast = locmast;
                    }
                }else if (locmast.getLocSts().equals("D")){
                    locMast = null;
                }