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:
砂糖
2025-12-10 15:11:33 +08:00
parent 5c5beb01c0 d9710eae8b
commit e91f66fbb2
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())) {