From 02dc9d35e2b21442bffa249fa809ce4611198cb7 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 16:06:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=96=91=E9=9A=BE=E6=9D=82=E7=97=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/wms/common/StructFindUtil.java | 2 +- .../src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql | 1 + 2 files changed, 2 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 6678176..2f6ec28 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 @@ -137,7 +137,7 @@ public class StructFindUtil { String lineMaterialCode = line.getString("material_code"); // 先匹配类型 if (StrUtil.isNotEmpty(lineMaterialType) - && !StrUtil.equals(lineMaterialType, "0") + && !StrUtil.equals(lineMaterialType, "0") && StrUtil.equals(materialType, lineMaterialType)) { // 如果规定了特定类型 且 物料类型和特定类型不一致 下一轮循环 if (StrUtil.isNotEmpty(lineMaterialCode) && !StrUtil.equals(lineMaterialCode, "0") && !StrUtil.equals(materialCode, lineMaterialCode)) { diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql index 2343428..4e672a7 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql @@ -280,6 +280,7 @@ IF 输入.flag = "9" point.point_name AS struct_name, point.vehicle_code, ivt.canuse_qty, + ivt.is_full, ruledis.out_seq_no, material.material_id, material.material_code,