DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X

Browse Source
This commit is contained in:
砂糖
2026-01-15 11:03:15 +08:00
parent 3d59a320a5 7482c2ba2e
commit 1a5b2eb869
1 changed files with 41 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
View File

@@ -412,7 +412,9 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
} }
// 使用 EXISTS 针对 selectType 的细粒度筛选（使用参数占位符防注入） // 使用 EXISTS 针对 selectType 的细粒度筛选（使用参数占位符防注入）
if (hasSelectType && hasAnyItemFilter) { if (hasSelectType) {
qw.eq("mc.item_type", bo.getSelectType());
if (hasAnyItemFilter) {
StringBuilder existsSql = new StringBuilder(); StringBuilder existsSql = new StringBuilder();
List<Object> existsArgs = new ArrayList<>(); List<Object> existsArgs = new ArrayList<>();
if ("product".equals(bo.getSelectType())) { if ("product".equals(bo.getSelectType())) {
@@ -452,6 +454,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
qw.apply(existsSql.toString(), existsArgs.toArray()); qw.apply(existsSql.toString(), existsArgs.toArray());
} }
} }
}
// 显式 itemId 条件：与 EXISTS 共存时，语义为交集 // 显式 itemId 条件：与 EXISTS 共存时，语义为交集
if (CollectionUtils.isNotEmpty(explicitItemIds)) { if (CollectionUtils.isNotEmpty(explicitItemIds)) {