#

Junjie

6 天以前 63982856d55e3e0c64886be9c99d7beaaf39ca00

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

@@ -169,15 +169,17 @@
                }
            }

            //检测是否为呆滞料
            String matnr = findLocNoAttributeVo.getMatnr();
            Mat mat = matService.selectByMatnr(matnr);
            if (mat == null) {
                throw new CoolException(matnr + "物料信息不存在");
            }
            if (staDescId != 10) {
                //检测是否为呆滞料
                String matnr = findLocNoAttributeVo.getMatnr();
                Mat mat = matService.selectByMatnr(matnr);
                if (mat == null) {
                    throw new CoolException(matnr + "物料信息不存在");
                }

            if (mat.getTscp() != null && mat.getTscp() == 1) {
                crnList.add(0, 1);
                if (mat.getTscp() != null && mat.getTscp() == 1) {
                    crnList.add(0, 1);
                }
            }
        }else if (barcode.startsWith("16")) {
            crnList.add(6);
@@ -504,6 +506,18 @@
                    break;
                }
            }

            if(targetLocMast == null) {
                //深库位找完都没找到，直接找浅库位
                for (LocMast locMast : locMastsList) {
                    if (!VersionUtils.locMoveCheckLocTypeComplete(locMast, locTypeDto)) {
                        continue;
                    }

                    //空库位直接选择
                    targetLocMast = locMast;
                }
            }
        }

        return targetLocMast;