门店供应链物品管理/记录

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/ChannelGoodsSettleMgrController.java

@@ -72,12 +72,13 @@ public class ChannelGoodsSettleMgrController extends BaseApiController {
         queryWrapper.eq(null != queryParam && StringUtils.isNotBlank(queryParam.getOrderId()), "t1.order_id", queryParam.getOrderId());
         queryWrapper.eq(null != queryParam && null != queryParam.getChannelId(), "t1.`channel_id`", queryParam.getChannelId());
         queryWrapper.eq(null != queryParam && StringUtils.isNotBlank(queryParam.getTel()), "t1.`tel`", queryParam.getTel());
-        queryWrapper.eq(null != queryParam && null != queryParam.getSettleStatus(), "t3.status", queryParam.getSettleStatus());
+        queryWrapper.eq(null != queryParam && StringUtils.isNotBlank(queryParam.getSettleStatus()), "t3.status", queryParam.getSettleStatus());
         queryWrapper.eq("t1.status", ChannelGoodsOrderStatusEnum.FINISHED.getValue());
         queryWrapper.ge(null != queryParam && null != queryParam.getMinStock(), "t3.remain_qty", queryParam.getMinStock());
         queryWrapper.le(null != queryParam && null != queryParam.getMaxStock(), "t3.remain_qty", queryParam.getMaxStock());
         queryWrapper.ge(null != queryParam && null != queryParam.getStartTime(), "t1.created_time", queryParam.getStartTime());
         queryWrapper.le(null != queryParam && null != queryParam.getEndTime(), "t1.created_time", queryParam.getEndTime());
+        queryWrapper.like(null != queryParam && StringUtils.isNotBlank(queryParam.getTitle()), "t1.title", queryParam.getTitle());
         queryWrapper.orderByDesc("t1.created_time", "t1.order_id");
 
         List<ChannelGoodsSettleVO> channelGoodsOrderSettleVOS = channelGoodsOrderService.selectChannelGoodsSettleList(queryWrapper);