问题处理

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockWaitServiceImpl.java

@@ -118,7 +118,6 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
         wrapper.orderByDesc("sw", StockWait::getId);
         //过滤入库/出库
         wrapper.eq("sw", StockWait::getType, dto.getType());
-        wrapper.eq("sw", StockWait::getStatus, dto.getStatus());
         wrapper.eq("sw", StockWait::getBusinessType, dto.getBusinessType());
 
         //关键字搜索
@@ -131,8 +130,12 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
             );
         }
 
-        //过滤掉待出入库 已完成/手动结束 的数据
-        wrapper.notIn("sw", StockWait::getStatus, 2, 3);
+        if (ObjectUtil.isEmpty(dto.getStatus())) {
+            //过滤掉待出入库 已完成/手动结束 的数据
+            wrapper.notIn("sw", StockWait::getStatus, 2, 3);
+        } else {
+            wrapper.eq("sw", StockWait::getStatus, dto.getStatus());
+        }
 
         wrapper.groupBy("sw.id");
         Page<StockWaitVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
@@ -221,7 +224,7 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
 
         //物流公司名称
         CompanyInfo one = companyInfoService.getOne(q -> q.eq(CompanyInfo::getCode, result.getLogisticsCompanyCode()));
-        if(ObjectUtil.isNotEmpty(one)){
+        if (ObjectUtil.isNotEmpty(one)) {
             result.setLogisticsCompanyName(one.getName());
         }