提交 f64b8456 authored 作者: 许俊's avatar 许俊

修改

上级 4b42880d
package org.jeecg.modules.iost.basedata.controller; package org.jeecg.modules.iost.basedata.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.iost.basedata.entity.*; import org.jeecg.modules.iost.basedata.entity.*;
import org.jeecg.modules.iost.basedata.entity.Vo.HouseSubmitVo; import org.jeecg.modules.iost.basedata.entity.Vo.HouseSubmitVo;
import org.jeecg.modules.iost.basedata.service.*; import org.jeecg.modules.iost.basedata.service.*;
...@@ -13,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -13,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -35,6 +40,29 @@ public class HouseWarehousingLocationController extends JeecgController<HouseWar ...@@ -35,6 +40,29 @@ public class HouseWarehousingLocationController extends JeecgController<HouseWar
@Autowired @Autowired
HouseILocationReadyService houseILocationReadyService; HouseILocationReadyService houseILocationReadyService;
/**
* 分页列表查询
*
* @param houseWarehousingLocation
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "入库定位单-分页列表查询")
@ApiOperation(value="入库定位单-分页列表查询", notes="入库定位单-分页列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList(HouseWarehousingLocation houseWarehousingLocation,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<HouseWarehousingLocation> queryWrapper = QueryGenerator.initQueryWrapper(houseWarehousingLocation, req.getParameterMap());
Page<HouseWarehousingLocation> page = new Page<HouseWarehousingLocation>(pageNo, pageSize);
IPage<HouseWarehousingLocation> pageList = houseIWarehousingLocationService.page(page, queryWrapper);
return Result.OK(pageList);
}
/*根据仓位查询仓库*/ /*根据仓位查询仓库*/
@AutoLog(value = "根据仓位查询仓库") @AutoLog(value = "根据仓位查询仓库")
@ApiOperation(value = "根据仓位查询仓库", notes = "根据仓位查询仓库") @ApiOperation(value = "根据仓位查询仓库", notes = "根据仓位查询仓库")
......
...@@ -95,15 +95,5 @@ public class HouseWarehousingLocation implements Serializable { ...@@ -95,15 +95,5 @@ public class HouseWarehousingLocation implements Serializable {
@ApiModelProperty(value = "状态") @ApiModelProperty(value = "状态")
private String status; private String status;
/**
* 待上架产品明细
*/
@ApiModelProperty(value = "待上架产品明细")
private List<HouseLocationReady> houseLocationReadyList;
/**
* 已上架产品明细
*/
@ApiModelProperty(value = "已上架产品明细")
private List<HouseWarehousing> houseWarehousingList;
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论