#

whycq

2023-06-29 ed361165f4518ab5eaa94bfc5fc97f30603619f4

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

@@ -162,14 +162,18 @@
    @Transactional
    public void startupFullTakeStore(StockOutParam param, Long userId) {
        List<StockOutParam.LocDetl> locDetls = new ArrayList<>();
        List<String> locs = new ArrayList<>();
        for(StockOutParam.LocDetl one : param.getLocDetls()){
            locs.add(one.getLocNo());
        }

        //出库时，如果当前库位组有相同的物料，则先出外侧物料
        for (StockOutParam.LocDetl locDetl : param.getLocDetls()) {
            List<String> outerSingleLoc = Utils.getGroupOuterSingleLoc(locDetl.getLocNo());
            outerSingleLoc.add(locDetl.getLocNo());
            boolean flag = false;
            Double useCount = 0D;
            for (String locNo : outerSingleLoc) {
                if(locs.contains(locNo)) continue;
                for (LocDetl locDetl0 : locDetlService.selectByLocNo(locNo)) {
                    if (!locDetl0.getMatnr().equals(locDetl.getMatnr())) {
                        //不是相同物料
@@ -177,6 +181,9 @@
                    }
                    double lastCount = locDetl.getCount() - useCount;//剩余所需数量
                    double realCount = 0;//实际提供数量
                    if (lastCount==0){
                        continue;
                    }
                    if (locDetl0.getAnfme() >= lastCount) {//实际数量大于所需数量，按所需数量提供
                        realCount = lastCount;
                    } else {
@@ -199,6 +206,17 @@
            }

        }
        // TODO: 2023/6/28 等李薇确认是否使用
        // ----------------------------------------------
        //for(StockOutParam.LocDetl one : param.getLocDetls()){
        //    List<String> outerSingleLoc = Utils.getGroupOuterSingleLoc(one.getLocNo());
        //    for (String s : outerSingleLoc) {
        //        if (!locs.contains(s)) {
        //            throw new CoolException("浅库位有相同物料不支持出库");
        //        }
        //    }
        //}
        // ----------------------------------------------

//        ArrayList<String> locNos = new ArrayList<>();
//        for (StockOutParam.LocDetl locDetl:param.getLocDetls()){
@@ -465,10 +483,15 @@
                if (!locMast.getLocSts().equals("F")) {
                    continue;
                }

                if (locMast.getLocSts().equals("F")) {
                    throw new CoolException("浅库位在库不支持此任务");
                }
                boolean flag = false;
                for (LocDetl locDetl : locDetlService.selectByLocNo(locMast.getLocNo())) {
                    if (!locDetl.getMatnr().equals(matnr)) {
                        flag = true;
                        break;
                    }else if (!Cools.isEmpty(ioWorkType) && ioWorkType.equals(IoWorkType.CHECK_OUT)){
                        flag = true;
                        break;
                    }
@@ -477,7 +500,7 @@
                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 +518,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"); // 拣料
@@ -524,6 +547,7 @@
                        wrkDetl.setModiUser(userId);
                        wrkDetl.setSpecs(locDetl.getSpecs());
                        wrkDetl.setMatType(locDetl.getMatType());
                        wrkDetl.setZpallet(locMast.getBarcode());
                        if (!wrkDetlService.insert(wrkDetl)) {
                            throw new CoolException("保存工作档明细失败");
                        }
@@ -581,10 +605,15 @@
            LocMast locMast = locMastService.selectById(dto.getLocNo());

            //-----------------2023.6.2出库兼容代码-----------------------
            List<LocDetl> locDetls = locDetlService.selectByLocNo(locMast.getLocNo());
            if (locMast.getLocType2() == 1 && locDetls.size() > 1) {
                //单品区域出库物料大于1种，强制变成101全板出库
                ioType = 101;
            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-----------------------

@@ -640,6 +669,7 @@
                wrkDetl.setModiUser(userId);
                wrkDetl.setSpecs(detlDto.getLocDetl().getSpecs());
                wrkDetl.setMatType(detlDto.getLocDetl().getMatType());
                wrkDetl.setZpallet(locMast.getBarcode());
                if (!wrkDetlService.insert(wrkDetl)) {
                    throw new CoolException("保存工作档明细失败");
                }