Merge branch 'ww' into test

eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockDetailServiceImpl.java

@@ -5,7 +5,6 @@ import cn.hutool.core.util.StrUtil;
 import cn.ysk.cashier.dto.product.*;
 import cn.ysk.cashier.exception.BadRequestException;
 import cn.ysk.cashier.mybatis.mapper.TbProducSkutMapper;
-import cn.ysk.cashier.pojo.order.TbOrderInfo;
 import cn.ysk.cashier.pojo.product.TbProduct;
 import cn.ysk.cashier.pojo.product.TbProductStockDetail;
 import cn.ysk.cashier.pojo.shop.TbShopUnit;
@@ -88,6 +87,9 @@ public class TbProductStockDetailServiceImpl implements TbProductStockDetailServ
                 case "lossNumber":
                     criteria.setTypes(Collections.singletonList("报损"));
                     break;
+                default:
+                    criteria.setTypes(Arrays.asList("供应商入库", "盘点入库", "其他入库", "退单","供应商出库","其他出库","盘点出库","售出记录","报损"));
+                    break;
             }
         }
 
@@ -96,7 +98,8 @@ public class TbProductStockDetailServiceImpl implements TbProductStockDetailServ
 
         Page<TbProductStockDetail> page = tbProductStockDetailRepository.findByProductParam(
                 criteria.getShopId().toString(), criteria.getProductName(),
-                criteria.getCategoryId(),criteria.getType(),criteria.getTypes(),
+                criteria.getCategoryId(),criteria.getType(),
+                criteria.getTypes() ,
                 criteria.getStartTime().getTime(), criteria.getEndTime().getTime(), pageable);
         Page<TbProductStockDetailDto> map = page.map(tbProductStockDetailMapper::toDto);