1

zhang

10 天以前 b51eadaa66a5c0ee6da0e418a3ba193dfc878fca

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

@@ -541,6 +541,7 @@
        if ((locMast.getBay1() >= 3 && locMast.getBay1() <= 6) ) {
            locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                    .eq("row1", locMast.getBay1())
                    .in("bay1", 3,4,5,6)
                    .eq("crn_no", 7)
                    .eq("loc_type1", locMast.getLocType1())
                    .orderBy("bay1", true));
@@ -1770,30 +1771,50 @@
            LocMast locMast = locMastService.selectById(dto.getLocNo());

            List<LocMast> locMasts = new ArrayList<>();
            if ((locMast.getBay1() >= 1 && locMast.getBay1() <= 2) || (locMast.getBay1() >= 6 && locMast.getBay1() <= 7 && locMast.getRow1() != 36 && locMast.getRow1() != 29) || (locMast.getBay1() >= 11 && locMast.getBay1() <= 12)) {
//            if ((locMast.getBay1() >= 1 && locMast.getBay1() <= 2) || (locMast.getBay1() >= 6 && locMast.getBay1() <= 7 && locMast.getRow1() != 36 && locMast.getRow1() != 29) || (locMast.getBay1() >= 11 && locMast.getBay1() <= 12)) {
//                locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
//                        .eq("gro1", locMast.getGro1())
//                        .eq("crn_no", 7)
//                        .eq("loc_type1", locMast.getLocType1())
//                        .orderBy("bay1", false));
//            } else {
//                locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
//                        .eq("gro1", locMast.getGro1())
//                        .eq("crn_no", 7)
//                        .eq("loc_type1", locMast.getLocType1())
//                        .orderBy("bay1", true));
//            }
//            for (LocMast locMast1 : locMasts) {
//                if (locMast1.getLocNo().equals(dto.getLocNo())) {
//                    break;
//                }
//                if (locMast1.getLocSts().equals("X")) {
//                    throw new CoolException(dto.getLocNo() + "库位前方有锁定库位，禁止出库");
//                }
//                if (locMast1.getLocSts().equals("F")) {
//                    moveLocForDeepLoc(locMast1);
//                }
//            }
            if ((locMast.getBay1() >= 3 && locMast.getBay1() <= 6) ) {
                locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                        .eq("gro1", locMast.getGro1())
                        .eq("crn_no", 7)
                        .eq("loc_type1", locMast.getLocType1())
                        .orderBy("bay1", false));
            } else {
                locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                        .eq("gro1", locMast.getGro1())
                        .eq("row1", locMast.getBay1())
                        .in("bay1", 3,4,5,6)
                        .eq("crn_no", 7)
                        .eq("loc_type1", locMast.getLocType1())
                        .orderBy("bay1", true));
            }
            for (LocMast locMast1 : locMasts) {
                if (locMast1.getLocNo().equals(dto.getLocNo())) {
                    break;
                }
                if (locMast1.getLocSts().equals("X")) {
                    throw new CoolException(dto.getLocNo() + "库位前方有锁定库位，禁止出库");
                }
                if (locMast1.getLocSts().equals("F")) {
                    moveLocForDeepLoc(locMast1);
                for (LocMast locMast1 : locMasts) {
                    if (locMast1.getLocNo().equals(locMast.getLocNo())) {
                        break;
                    }
                    if (locMast1.getLocSts().equals("X")) {
                        throw new CoolException(locMast.getLocNo() + "库位前方有锁定库位，禁止出库");
                    }
                    if (locMast1.getLocSts().equals("F")) {
                        locMast = locMast1;
                    }
                }
            }


            Integer outSta = staNo.getDevNo();
//            //2号堆垛机全板出库站指定为204站，拣料站指定为202
@@ -1896,6 +1917,7 @@
        wrkMast.setEmptyMk("Y"); // 空板
        wrkMast.setBarcode(wrkMastold.getBarcode()); // 托盘码
        wrkMast.setLinkMis("N");
        wrkMast.setPltType(wrkMastold.getWrkNo());
        wrkMast.setAppeTime(new Date());
        wrkMast.setModiTime(new Date());
        boolean res = wrkMastService.insert(wrkMast);
@@ -1958,6 +1980,7 @@
        wrkMast.setEmptyMk(wrkDetls != null ? "N" : "Y"); // 空板
        wrkMast.setBarcode(wrkMastold.getBarcode()); // 托盘码
        wrkMast.setLinkMis("N");
        wrkMast.setPltType(wrkMastold.getWrkNo());
        wrkMast.setAppeTime(new Date());
        wrkMast.setModiTime(new Date());
        boolean res = wrkMastService.insert(wrkMast);