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

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

@@ -20,6 +20,7 @@ import com.qs.mp.channel.service.IChannelGoodsSettleOrderService;
 import com.qs.mp.common.core.domain.AjaxResult;
 import com.qs.mp.common.core.page.TableDataInfo;
 import com.qs.mp.common.enums.ChannelGoodsOrderSettleEnum;
+import com.qs.mp.common.enums.ChannelGoodsOrderStatusEnum;
 import com.qs.mp.system.service.id.BizIdGenerator;
 import com.qs.mp.web.controller.common.BaseApiController;
 import io.swagger.annotations.Api;
@@ -71,6 +72,7 @@ public class ChannelGoodsSettleMgrController extends BaseApiController {
         queryWrapper.eq(null != queryParam && null != queryParam.getStatus(), "t1.`channel_id`", queryParam.getChannelId());
         queryWrapper.eq(null != queryParam && StringUtils.isNotBlank(queryParam.getTel()), "t1.`tel`", queryParam.getTel());
         queryWrapper.eq(null != queryParam && null != queryParam.getSettleStatus(), "t2.status", queryParam.getSettleStatus());
+        queryWrapper.eq("t1.status", ChannelGoodsOrderStatusEnum.FINISHED.getValue());
         queryWrapper.ge(null != queryParam && null != queryParam.getMinStock(), "t2.remain_qty", queryParam.getMinStock());
         queryWrapper.le(null != queryParam && null != queryParam.getMaxStock(), "t2.remain_qty", queryParam.getMaxStock());
         queryWrapper.ge(null != queryParam && null != queryParam.getStartTime(), "t1.created_time", queryParam.getStartTime());