#1

dubin

1 天以前 a00edfd8bd90940d0b6e1d6876e443a1317d5701

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

@@ -1213,6 +1213,15 @@
                    News.error("" + mark + " - 2" + " - 2" + " - 出库操作库位状态不符合--状态, 库位号={}，库位状态={}", wrkMast.getLocNo(), sourceSta.getLocSts());
                    continue;
                }
                //获取浅库位信息
                if (Utils.isDeepLoc(slaveProperties, wrkMast.getSourceLocNo())) {
                    String shallowLoc1 = Utils.getShallowLoc(slaveProperties, wrkMast.getSourceLocNo());
                    LocMast locMast = locMastService.selectById(shallowLoc1);
                    if (shallowLoc1 != null && (locMast.getLocSts().equals("P") || locMast.getLocSts().equals("Q") || locMast.getLocSts().equals("R") || locMast.getLocSts().equals("S"))) {
                        News.error(wrkMast.getSourceLocNo() + "对应的浅库位为P/Q/R/S，暂时不出深库位");
                        continue;
                    }
                }
                // 获取堆垛机出库站信息
                SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
                StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo());
@@ -2719,7 +2728,7 @@
                if (Utils.isDeepLoc(slaveProperties, row)) {
                    if (shallowLoc.getBay1() == 1) {
                        loc = locMastService.queryFreeLocMast2(row, shallowLoc.getLocType1(), 29);
                    } else if (shallowLoc.getRow1() == 29) {
                    } else if (shallowLoc.getBay1() == 29) {
                        loc = locMastService.queryFreeLocMast2(row, shallowLoc.getLocType1(), 1);
                    } else {
                        loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1());
@@ -2745,7 +2754,7 @@
                    if (Utils.isShallowLoc(slaveProperties, row)) {
                        if (shallowLoc.getBay1() == 1) {
                            loc = locMastService.queryFreeLocMast2(row, shallowLoc.getLocType1(), 29);
                        } else if (shallowLoc.getRow1() == 29) {
                        } else if (shallowLoc.getBay1() == 29) {
                            loc = locMastService.queryFreeLocMast2(row, shallowLoc.getLocType1(), 1);
                        } else {
                            loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1());