diff --git a/src/main/java/com/heai/modules/board/controller/InventoryController.java b/src/main/java/com/heai/modules/board/controller/InventoryController.java index f7d6ebc..1119f6c 100644 --- a/src/main/java/com/heai/modules/board/controller/InventoryController.java +++ b/src/main/java/com/heai/modules/board/controller/InventoryController.java @@ -1,14 +1,12 @@ package com.heai.modules.board.controller; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.heai.common.utils.R; import com.heai.modules.board.entity.Inventory; import com.heai.modules.board.service.BoardService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -19,9 +17,11 @@ public class InventoryController { @Autowired private BoardService boardService; - @PostMapping - private R inventory(@RequestBody Inventory inventory) { - List list = boardService.queryPartInventory(inventory); - return R.ok().put("rows",list); + @PostMapping("/{no}/{size}") + private R inventory(@RequestBody Inventory inventory, + @PathVariable Integer no, + @PathVariable Integer size) { + IPage page = boardService.queryPartInventory(no,size,inventory); + return R.ok().put("rows",page.getRecords()).put("total",page.getTotal()); } } diff --git a/src/main/java/com/heai/modules/board/service/BoardService.java b/src/main/java/com/heai/modules/board/service/BoardService.java index 9c49b85..eb9499f 100644 --- a/src/main/java/com/heai/modules/board/service/BoardService.java +++ b/src/main/java/com/heai/modules/board/service/BoardService.java @@ -1,6 +1,7 @@ package com.heai.modules.board.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.heai.modules.board.entity.BIBoardAddressData; import com.heai.modules.board.entity.Inventory; import com.heai.modules.board.entity.ViewKanbanCODelNotifyData; @@ -271,5 +272,5 @@ public interface BoardService { boolean isPackingWorkCenter(String site,String workCenterNo); - List queryPartInventory(Inventory inventory); + IPage queryPartInventory(int no,int size,Inventory inventory); } diff --git a/src/main/java/com/heai/modules/board/service/impl/BoardServiceImpl.java b/src/main/java/com/heai/modules/board/service/impl/BoardServiceImpl.java index 651348e..0303bda 100644 --- a/src/main/java/com/heai/modules/board/service/impl/BoardServiceImpl.java +++ b/src/main/java/com/heai/modules/board/service/impl/BoardServiceImpl.java @@ -2,6 +2,8 @@ package com.heai.modules.board.service.impl; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.heai.common.utils.DateUtil; import com.heai.common.utils.WeekUtil; import com.heai.modules.app.annotation.LoginUser; @@ -794,7 +796,7 @@ public class BoardServiceImpl implements BoardService { } @Override - public List queryPartInventory(Inventory inventory) { + public IPage queryPartInventory(int no, int size, Inventory inventory) { SysUserEntity loginUser = (SysUserEntity) SecurityUtils.getSubject().getPrincipal(); if (Objects.nonNull(loginUser)){ inventory.setLoginUser(loginUser.getUsername()); @@ -809,6 +811,7 @@ public class BoardServiceImpl implements BoardService { inventory.getEndExpiredDate().setMinutes(59); inventory.getEndExpiredDate().setSeconds(59); } - return baseMapper.queryPartInventory(inventory); + Page page = new Page<>(no, size); + return baseMapper.queryPartInventory(page,inventory); } } diff --git a/src/main/java/com/heai/modules/taskmanage/dao/TaskDetailDao.java b/src/main/java/com/heai/modules/taskmanage/dao/TaskDetailDao.java index ac20182..9b1430b 100644 --- a/src/main/java/com/heai/modules/taskmanage/dao/TaskDetailDao.java +++ b/src/main/java/com/heai/modules/taskmanage/dao/TaskDetailDao.java @@ -2,11 +2,14 @@ package com.heai.modules.taskmanage.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.heai.modules.board.entity.Inventory; import com.heai.modules.taskmanage.entity.TaskDetailEntity; import com.heai.modules.taskmanage.vo.TaskDetailVo; import com.heai.modules.taskmanage.vo.TaskListVo; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -48,5 +51,5 @@ public interface TaskDetailDao extends BaseMapper { */ List taskDetailReportList(TaskListVo params); - List queryPartInventory(Inventory inventory); + IPage queryPartInventory(@Param("page") Page page,@Param("params") Inventory inventory); } diff --git a/src/main/resources/mapper/taskmanage/TaskDatailDao.xml b/src/main/resources/mapper/taskmanage/TaskDatailDao.xml index 3413220..d31e336 100644 --- a/src/main/resources/mapper/taskmanage/TaskDatailDao.xml +++ b/src/main/resources/mapper/taskmanage/TaskDatailDao.xml @@ -220,14 +220,14 @@ T.PartNo, P.PartDescription, P.Spec, - + T.WarehouseID, P.UMID, - + T.LocationID, - + T.BatchNo, min(T.FirstInDate) as FirstInDate, @@ -256,64 +256,64 @@ Part as P where T.Site = P.Site and T.PartNo = P.PartNo - - and T.Site in (Select Site from AccessSite where upper(UserID) = #{loginUser}) + + and T.Site in (Select Site from AccessSite where upper(UserID) = #{params.loginUser}) - - and T.PartNo like #{partNo} + + and T.PartNo like #{params.partNo} - - and P.PartDescription like #{partDescription} + + and P.PartDescription like #{params.partDescription} - - and P.Spec like #{spec} + + and P.Spec like #{params.spec} - - and T.Site = #{site} + + and T.Site = #{params.site} - - and P.PartType like #{partType} + + and P.PartType like #{params.partType} - - and T.WarehouseID = #{warehouseId} + + and T.WarehouseID = #{params.warehouseId} - - and T.LocationID = #{locationId} + + and T.LocationID = #{params.locationId} - - and T.BatchNo = #{batchNo} + + and T.BatchNo = #{params.batchNo} - - and P.FamilyID like #{familyId} + + and P.FamilyID like #{params.familyId} - - and dbo.Get_PartFamilyDesc(P.Site, P.FamilyID) like #{familyName} + + and dbo.Get_PartFamilyDesc(P.Site, P.FamilyID) like #{params.familyName} - - and T.FirstInDate >= #{startFirstInDate} + + and T.FirstInDate >= #{params.startFirstInDate} - - and #{endFirstInDate} >= T.FirstInDate + + and #{params.endFirstInDate} >= T.FirstInDate - - and T.ExpiredDate >= #{startExpiredDate} + + and T.ExpiredDate >= #{params.startExpiredDate} - - and #{endExpiredDate} >= T.ExpiredDate + + and #{params.endExpiredDate} >= T.ExpiredDate group by T.Site, T.PartNo, P.PartDescription, P.Spec, - + T.WarehouseID, P.UMID, - + T.LocationID, - + T.BatchNo, P.Site,