#四向库订单出库单个出库

zjj

2025-02-12 1e5a083e2c1acd8ab24bbc3b0ba579b040abf6b9

 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;
@@ -630,7 +621,7 @@
        if (Cools.isEmpty(locMast) && crnNo != 0) {
            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                    .eq("bay1", nearRow)
                    .eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue())
                    .in("loc_sts", "O","X").eq("whs_type",rowLastnoType.getType().longValue())
                    .eq("crn_no",7)
                    .eq("loc_type1",locTypeDto.getLocType1())
                    .orderBy("lev1",true).orderBy("row1",false));//最浅库位
@@ -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)){