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

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

@@ -76,8 +76,8 @@ public class ChannelGoodsSettleMgrController extends BaseApiController {
         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.ge(null != queryParam && null != queryParam.getStartTime(), "t3.created_time", queryParam.getStartTime());
+        queryWrapper.le(null != queryParam && null != queryParam.getEndTime(), "t3.created_time", queryParam.getEndTime());
         queryWrapper.like(null != queryParam && StringUtils.isNotBlank(queryParam.getTitle()), "t1.title", queryParam.getTitle());
         queryWrapper.orderByDesc("t1.created_time", "t1.order_id");
 

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

@@ -14,6 +14,7 @@ import com.qs.mp.channel.service.IChannelGoodsService;
 import com.qs.mp.common.core.domain.AjaxResult;
 import com.qs.mp.common.core.page.TableDataInfo;
 import com.qs.mp.common.enums.ChannelGoodsSettleStatusTypeEnum;
+import com.qs.mp.common.enums.GoodsStatusEnum;
 import com.qs.mp.utils.SecurityUtils;
 import com.qs.mp.web.controller.common.BaseApiController;
 import io.swagger.annotations.Api;
@@ -64,6 +65,7 @@ public class ChannelGoodsController extends BaseApiController {
         startPage();
         QueryWrapper<Goods> queryWrapper = new QueryWrapper<Goods>();
         queryWrapper.eq("type", param.getType())
+                .eq("status", GoodsStatusEnum.PUT_ON)
                 .orderByDesc("created_time");
         List<Goods> goodsList = goodsService.list(queryWrapper);