root/rongLiJiaNai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

疑难杂症

Browse Source
This commit is contained in:
张江玮
2022-11-12 16:06:55 +08:00
parent 283e5ba61e
commit 02dc9d35e2
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java
View File

@@ -137,7 +137,7 @@ public class StructFindUtil {
String lineMaterialCode = line.getString("material_code"); String lineMaterialCode = line.getString("material_code");
// 先匹配类型 // 先匹配类型
if (StrUtil.isNotEmpty(lineMaterialType) if (StrUtil.isNotEmpty(lineMaterialType)
&& !StrUtil.equals(lineMaterialType, "0") && !StrUtil.equals(lineMaterialType, "0")
&& StrUtil.equals(materialType, lineMaterialType)) { && StrUtil.equals(materialType, lineMaterialType)) {
// 如果规定了特定类型 且 物料类型和特定类型不一致 下一轮循环 // 如果规定了特定类型 且 物料类型和特定类型不一致 下一轮循环
if (StrUtil.isNotEmpty(lineMaterialCode) && !StrUtil.equals(lineMaterialCode, "0") && !StrUtil.equals(materialCode, lineMaterialCode)) { if (StrUtil.isNotEmpty(lineMaterialCode) && !StrUtil.equals(lineMaterialCode, "0") && !StrUtil.equals(materialCode, lineMaterialCode)) {

1
wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql
View File

@@ -280,6 +280,7 @@ IF 输入.flag = "9"
point.point_name AS struct_name, point.point_name AS struct_name,
point.vehicle_code, point.vehicle_code,
ivt.canuse_qty, ivt.canuse_qty,
ivt.is_full,
ruledis.out_seq_no, ruledis.out_seq_no,
material.material_id, material.material_id,
material.material_code, material.material_code,