wms功能完善

pang.jiabao

1 天以前 4725ab4c1f4d0560097ae3469a42de23eb459056

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

@@ -179,9 +179,10 @@
        if (locMasts.size() <= 4) {
            switch (locType) {
                case 0:
                case 2:
                    return getLocNoRunNew(ioType, sourceSite, 3);
                    return getLocNoRunNew(ioType, sourceSite, 1);
                case 1:
                    return getLocNoRunNew(ioType, sourceSite, 2);
                case 2:
                case 3:
                    throw new CoolException("当前库位剩余四个用于移库，无法占用：" + locType);
                default:
@@ -194,7 +195,7 @@
               locMast = first.get();
        } else {
            // 深库位里面没有从浅库位里面取
            Optional<LocMast> first2 = locMasts.stream().filter(o -> o.getRow1() == 2 || o.getRow1() == 3 || o.getRow1() == 5 || o.getRow1() == 7).findFirst();
            Optional<LocMast> first2 = locMasts.stream().filter(o -> o.getRow1() == 2 || o.getRow1() == 3 || o.getRow1() == 6 || o.getRow1() == 7).findFirst();
            if(first2.isPresent()) {
                locMast = first2.get();
            }