diff --git a/src/main/java/com/heai/modules/board/controller/InventoryController.java b/src/main/java/com/heai/modules/board/controller/InventoryController.java new file mode 100644 index 0000000..f7d6ebc --- /dev/null +++ b/src/main/java/com/heai/modules/board/controller/InventoryController.java @@ -0,0 +1,27 @@ +package com.heai.modules.board.controller; + + +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 java.util.List; + +@RestController +@RequestMapping("/inventory") +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); + } +} diff --git a/src/main/java/com/heai/modules/board/entity/Inventory.java b/src/main/java/com/heai/modules/board/entity/Inventory.java new file mode 100644 index 0000000..36ced9a --- /dev/null +++ b/src/main/java/com/heai/modules/board/entity/Inventory.java @@ -0,0 +1,63 @@ +package com.heai.modules.board.entity; + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +public class Inventory { + + private String partNo; + private String partDescription; + + private String spec; + private String warehouseId; + private String locationId; + + private String batchNo; + + private BigDecimal qtyOnHand; + private String umId; + + private Date firstInDate; + private String freezeFlag; + + private String partType; + + private String familyId; + + private String familyName; + + private Date latestOutDate; + + private Date activeDate; + + private String partnerId; + private String partnerType; + + private String site; + + private Date manufactureDate; + + private Date expiredDate; + + private String demandPartnerId; + + private String demandPartnerName; + private String demandPartnerType; + private String latestCountDate; + private String groupID; + private String partGroup; + private Date latestInDate; + private BigDecimal qtyReserved; + + + private BigDecimal standartStockValue; + private BigDecimal actualStockValue; + + private Date finalStartDate; + private Date finalEndDate; + + private String loginUser; +} 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 95bce33..9c49b85 100644 --- a/src/main/java/com/heai/modules/board/service/BoardService.java +++ b/src/main/java/com/heai/modules/board/service/BoardService.java @@ -2,6 +2,7 @@ package com.heai.modules.board.service; import com.heai.modules.board.entity.BIBoardAddressData; +import com.heai.modules.board.entity.Inventory; import com.heai.modules.board.entity.ViewKanbanCODelNotifyData; import com.heai.modules.board.entity.ViewKanbanSoHunlianPlanData; import com.heai.modules.production.entity.*; @@ -269,4 +270,6 @@ public interface BoardService { BigDecimal getPartValue(String site,String partNo); boolean isPackingWorkCenter(String site,String workCenterNo); + + List queryPartInventory(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 b9cd3b7..a90a0d7 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 @@ -4,6 +4,7 @@ package com.heai.modules.board.service.impl; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.heai.common.utils.DateUtil; import com.heai.common.utils.WeekUtil; +import com.heai.modules.app.annotation.LoginUser; import com.heai.modules.board.dao.BoardMapper; import com.heai.modules.board.entity.*; import com.heai.modules.board.service.BoardService; @@ -13,9 +14,11 @@ import com.heai.modules.production.dao.SoScheduledListMapper; import com.heai.modules.production.dao.TcpMapper; import com.heai.modules.production.entity.*; import com.heai.modules.production.service.PrintLabelRecordService; +import com.heai.modules.sys.entity.SysUserEntity; import com.heai.modules.taskmanage.dao.TaskDetailDao; import com.heai.modules.taskmanage.vo.TaskDetailVo; import com.heai.modules.taskmanage.vo.TaskListVo; +import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -789,4 +792,11 @@ public class BoardServiceImpl implements BoardService { } return true; } + + @Override + public List queryPartInventory(Inventory inventory) { + SysUserEntity loginUser = (SysUserEntity) SecurityUtils.getSubject().getPrincipal(); + inventory.setLoginUser(loginUser.getUsername()); + return baseMapper.queryPartInventory(inventory); + } } diff --git a/src/main/java/com/heai/modules/production/service/impl/PrintLabelRecordServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/PrintLabelRecordServiceImpl.java index ed7b24e..a8261b8 100644 --- a/src/main/java/com/heai/modules/production/service/impl/PrintLabelRecordServiceImpl.java +++ b/src/main/java/com/heai/modules/production/service/impl/PrintLabelRecordServiceImpl.java @@ -183,8 +183,8 @@ public class PrintLabelRecordServiceImpl extends ServiceImpl { * @date: 2022/10/9 13:17 */ List taskDetailReportList(TaskListVo params); + + List queryPartInventory(Inventory inventory); } diff --git a/src/main/resources/mapper/production/DailyPlanMapper.xml b/src/main/resources/mapper/production/DailyPlanMapper.xml index 6f2ee64..7c79794 100644 --- a/src/main/resources/mapper/production/DailyPlanMapper.xml +++ b/src/main/resources/mapper/production/DailyPlanMapper.xml @@ -1208,16 +1208,54 @@ - + \ No newline at end of file