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

This commit is contained in:
砂糖
2026-01-15 11:03:15 +08:00

View File

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