#

zjj

2024-12-09 d77e5ae3f0a372a478ac7cc081121273ac9b4331

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

@@ -536,7 +536,7 @@


        // 相似工作档案 --- 同天同规格物料
        if (!Cools.isEmpty(matnr) && (staDescId == 1 || staDescId == 11 || staDescId == 111) ) {
        if (!Cools.isEmpty(matnr) && (staDescId == 1 || staDescId == 11 || staDescId == 111) && !mixture ) {
            //查询相似工作档案
            List<WrkMast> wrkMasts = wrkMastService.selectWrkMastWrkDetlMatnrBatch(staDescId, matnr, batch,grade, crnNo);
            int nearbay = 0;    //相似工作档案 目标库位列
@@ -567,15 +567,6 @@
                    continue;
                }
                for (LocMast locMastGro1 : locMasts) {
                    if (mixture){ //混料只允许放 7 12 14
                        if (locMastGro1.getBay1() != 7 && locMastGro1.getBay1() != 12 && locMastGro1.getBay1() != 14){
                            continue;
                        }
                    }else { //不混料不允许放 7 12 14
                        if (locMastGro1.getBay1() == 7 || locMastGro1.getBay1() == 12 || locMastGro1.getBay1() == 14){
                            continue;
                        }
                    }

                    if (locMastGro1.getBay1() == 2){ //wcs问题限制
                        continue;
@@ -674,6 +665,15 @@
                        continue;
                    }
                    for (LocMast locMastGro1 : locMasts1) {
                        if (mixture){ //混料只允许放 7 12 14
                            if (locMastGro1.getBay1() != 7 && locMastGro1.getBay1() != 12 && locMastGro1.getBay1() != 14){
                                continue;
                            }
                        }else { //不混料不允许放 7 12 14
                            if (locMastGro1.getBay1() == 7 || locMastGro1.getBay1() == 12 || locMastGro1.getBay1() == 14){
                                continue;
                            }
                        }
                        if (locMastGro1.getLocSts().equals("F")){
                            LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_No", locMastGro1.getLocNo()));
                            if (!locDetl.getMatnr().equals(matnr) || !locDetl.getBatch().equals(batch)){