diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java index e43870b..6678176 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java @@ -136,7 +136,9 @@ public class StructFindUtil { String lineMaterialType = line.getString("material_type"); String lineMaterialCode = line.getString("material_code"); // 先匹配类型 - if (!StrUtil.equals(lineMaterialCode, "0") && StrUtil.equals(materialType, lineMaterialType)) { + if (StrUtil.isNotEmpty(lineMaterialType) + && !StrUtil.equals(lineMaterialType, "0") + && StrUtil.equals(materialType, lineMaterialType)) { // 如果规定了特定类型 且 物料类型和特定类型不一致 下一轮循环 if (StrUtil.isNotEmpty(lineMaterialCode) && !StrUtil.equals(lineMaterialCode, "0") && !StrUtil.equals(materialCode, lineMaterialCode)) { continue;