#

Administrator

2023-06-06 5be1b24770e378900c606b428c5f28a8427afb88

#

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

@@ -151,15 +151,15 @@
                waitPakin.setFrozen(param.getFrozen()); // 是否冻结
                waitPakin.setManu(detlDto.getCstmr());
                waitPakin.setMatType(mat.getMatType());//物料类型
                if (Cools.isEmpty(mat.getMatType())){
                    throw new CoolException("物料类型异常"+mat.getMatnr());
                }else {
                    if (matType == 0){
                        matType = mat.getMatType();
                    }else if (matType!=mat.getMatType()){
                        throw new CoolException("请组托同一类型的物料");
                    }
                }
//                if (Cools.isEmpty(mat.getMatType())){
//                    throw new CoolException("物料类型异常"+mat.getMatnr());
//                }else {
//                    if (matType == 0){
//                        matType = mat.getMatType();
//                    }else if (matType!=mat.getMatType()){
//                        throw new CoolException("请组托同一类型的物料");
//                    }
//                }
                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存入库通知档失败");
                }
@@ -211,15 +211,15 @@
                waitPakin.setModiUser(userId);
                waitPakin.setModiTime(now);
                waitPakin.setMatType(mat.getMatType());//物料类型
                if (Cools.isEmpty(mat.getMatType())){
                    throw new CoolException("物料类型异常"+mat.getMatnr());
                }else {
                    if (matType == 0){
                        matType = mat.getMatType();
                    }else if (matType!=mat.getMatType()){
                        throw new CoolException("请组托同一类型的物料");
                    }
                }
//                if (Cools.isEmpty(mat.getMatType())){
//                    throw new CoolException("物料类型异常"+mat.getMatnr());
//                }else {
//                    if (matType == 0){
//                        matType = mat.getMatType();
//                    }else if (matType!=mat.getMatType()){
//                        throw new CoolException("请组托同一类型的物料");
//                    }
//                }
                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存入库通知档失败");
                }

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

@@ -471,13 +471,16 @@
                    if (!locDetl.getMatnr().equals(matnr)) {
                        flag = true;
                        break;
                    }else if (ioWorkType.equals(IoWorkType.CHECK_OUT)){
                        flag = true;
                        break;
                    }
                }

                if (flag) {
                    //当前巷道存在不同规格的物料，需要进行101全板出库
                    // 获取路径
                    StaDesc staDesc = staDescService.queryCrnStn(101, locMast.getCrnNo(), staNo.getDevNo(), locMast.getRow1());
                    StaDesc staDesc = staDescService.queryCrnStn(101, locMast.getCrnNo(), locMast.getCrnNo()==1? 100:200 , locMast.getRow1());
                    if(staDesc == null){
                        throw new CoolException("出库路径不存在");
                    }
@@ -495,7 +498,7 @@
                    wrkMast.setOutMost(0);
                    wrkMast.setCrnNo(locMast.getCrnNo());
                    wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 源站
                    wrkMast.setStaNo(staDesc.getStnNo()); // 目标站
                    wrkMast.setStaNo(locMast.getCrnNo()==1? 100:200); // 目标站
                    wrkMast.setSourceLocNo(locMast.getLocNo()); // 源库位
                    wrkMast.setFullPlt("Y"); // 满板：Y
                    wrkMast.setPicking("N"); // 拣料
@@ -580,23 +583,22 @@
            assert ioType != null;
            // 获取库位
            LocMast locMast = locMastService.selectById(dto.getLocNo());
            Integer devNo = staNo.getDevNo();

            //-----------------2023.6.2出库兼容代码-----------------------6.3更新
            List<LocDetl> locDetls = locDetlService.selectByLocNo(locMast.getLocNo());
            if (locMast.getLocType2() == 1 && locDetls.size() > 1) {
                //单品区域出库物料大于1种，强制变成101全板出库
                ioType = 101;
                if (locMast.getCrnNo()==1){
                    devNo = 100;
                }else {
                    devNo = 200;
            //-----------------2023.6.2出库兼容代码-----------------------
            if (ioType!=107){
                List<LocDetl> locDetls = locDetlService.selectByLocNo(locMast.getLocNo());
                if (locMast.getLocType2() == 1 && locDetls.size() > 1) {
                    //单品区域出库物料大于1种，强制变成101全板出库
                    ioType = 101;
                    if (staNo.getDevNo()==300){
                        staNo.setDevNo(200);
                    }
                }
            }
            //-----------------2023.6.2出库兼容代码end-----------------------

            // 获取路径
            StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), devNo, locMast.getRow1());
            StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), staNo.getDevNo(), locMast.getRow1());
            if(staDesc == null){
                throw new CoolException("出库路径不存在");
            }
@@ -614,7 +616,7 @@
            wrkMast.setOutMost(locMastService.isOutMost(dto.getLocNo(), false) ? 1 : 0);
            wrkMast.setCrnNo(locMast.getCrnNo());
            wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 源站
            wrkMast.setStaNo(devNo); // 目标站
            wrkMast.setStaNo(staDesc.getStnNo()); // 目标站
            wrkMast.setSourceLocNo(dto.getLocNo()); // 源库位
            wrkMast.setFullPlt("Y"); // 满板：Y
            wrkMast.setPicking("N"); // 拣料