From 283e5ba61eddf2eb059988748f30196d92f257fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B1=9F=E7=8E=AE?= Date: Sat, 12 Nov 2022 14:24:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BE=93=E9=80=81=E7=BA=BF=E7=89=A9=E6=96=99?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=88=A4=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/wms/common/StructFindUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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;