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

fix(wms): 修正物料查询条件判断逻辑

Browse Source 
- 将 itemType 判断改为 selectType 判断以匹配前端传参
- 保持原有的产品和原材料查询逻辑不变
- 确保查询条件过滤功能正常工作
This commit is contained in:
Joshi
2025-12-10 14:57:32 +08:00
parent 6c46c6cfe6
commit d9710eae8b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -349,7 +349,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
if (hasAnyItemFilter) { if (hasAnyItemFilter) {
try { try {
if ("product".equals(bo.getItemType())) { if ("product".equals(bo.getSelectType())) {
QueryWrapper<WmsProduct> pq = new QueryWrapper<>(); QueryWrapper<WmsProduct> pq = new QueryWrapper<>();
pq.eq("del_flag", 0); pq.eq("del_flag", 0);
if (StringUtils.isNotBlank(bo.getItemName())) { if (StringUtils.isNotBlank(bo.getItemName())) {
@@ -372,7 +372,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
.map(WmsProduct::getProductId) .map(WmsProduct::getProductId)
.filter(Objects::nonNull) // 过滤null的productId .filter(Objects::nonNull) // 过滤null的productId
.collect(Collectors.toList()); .collect(Collectors.toList());
} else if ("raw_material".equals(bo.getItemType())) { } else if ("raw_material".equals(bo.getSelectType())) {
QueryWrapper<WmsRawMaterial> rq = new QueryWrapper<>(); QueryWrapper<WmsRawMaterial> rq = new QueryWrapper<>();
rq.eq("del_flag", 0); rq.eq("del_flag", 0);
if (StringUtils.isNotBlank(bo.getItemName())) { if (StringUtils.isNotBlank(bo.getItemName())) {