From a975aa9cda4a7754f56a402926145e8240206d2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 8 Aug 2025 14:20:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/InventoryController.java | 14 +++++++ .../wms/common/pojo/qo/InventorySearchQO.java | 27 +++++++++++++ .../nflg/wms/common/pojo/vo/InventoryVO.java | 39 +++++++++++++++++++ .../repository/mapper/WmsInventoryMapper.java | 5 +++ .../service/IWmsInventoryService.java | 6 +++ .../service/impl/WmsInventoryServiceImpl.java | 9 +++++ .../resources/mapper/WmsInventoryMapper.xml | 21 ++++++++++ 7 files changed, 121 insertions(+) create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventorySearchQO.java create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryVO.java diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InventoryController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InventoryController.java index eeadf010..30fe65cf 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InventoryController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InventoryController.java @@ -12,6 +12,7 @@ import com.nflg.wms.common.pojo.dto.MaterialQRCodeContentDTO; import com.nflg.wms.common.pojo.qo.*; import com.nflg.wms.common.pojo.vo.InventoryCheckTaskItemVO; import com.nflg.wms.common.pojo.vo.InventoryCheckTaskVO; +import com.nflg.wms.common.pojo.vo.InventoryVO; import com.nflg.wms.common.pojo.vo.WmsInventoryCheckTaskItemMaterialVO; import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.common.util.VUtil; @@ -21,6 +22,7 @@ import com.nflg.wms.repository.entity.WmsInventoryCheckTaskItemMaterial; import com.nflg.wms.repository.service.IWmsInventoryCheckTaskItemMaterialService; import com.nflg.wms.repository.service.IWmsInventoryCheckTaskItemService; import com.nflg.wms.repository.service.IWmsInventoryCheckTaskService; +import com.nflg.wms.repository.service.IWmsInventoryService; import com.nflg.wms.starter.BaseController; import jakarta.annotation.Resource; import jakarta.validation.Valid; @@ -41,6 +43,9 @@ import java.util.Objects; @RequestMapping("/inventory") public class InventoryController extends BaseController { + @Resource + private IWmsInventoryService inventoryService; + @Resource private IWmsInventoryCheckTaskService inventoryCheckTaskService; @@ -53,6 +58,15 @@ public class InventoryController extends BaseController { @Resource private IWmsInventoryCheckTaskItemMaterialService inventoryCheckTaskItemMaterialService; + /** + * 库存查看 + * @param request 请求参数 + */ + @PostMapping("search") + public ApiResult> search(@Valid @RequestBody InventorySearchQO request) { + return ApiResult.success(inventoryService.search(request)); + } + /** * 保存库存盘点任务 * @param request 请求参数 diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventorySearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventorySearchQO.java new file mode 100644 index 00000000..41c880fb --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventorySearchQO.java @@ -0,0 +1,27 @@ +package com.nflg.wms.common.pojo.qo; + +import lombok.Data; + +@Data +public class InventorySearchQO extends PageQO { + + /** + * 物料编号 + */ + private String materialNo; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 工厂编号 + */ + private String factoryNo; + + /** + * 仓库编号 + */ + private String warehouseNo; +} diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryVO.java new file mode 100644 index 00000000..5aa98415 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryVO.java @@ -0,0 +1,39 @@ +package com.nflg.wms.common.pojo.vo; + +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class InventoryVO { + + /** + * 物料编号 + */ + private String materialNo; + + /** + * 工厂编号 + */ + private String factoryNo; + + /** + * 仓库编号 + */ + private String warehouseNo; + + /** + * 储位编号 + */ + private String binNos; + + /** + * 数量 + */ + private BigDecimal num; + + /** + * 批次号 + */ + private String batchNumber; +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsInventoryMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsInventoryMapper.java index 293784b3..4be47c33 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsInventoryMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsInventoryMapper.java @@ -1,6 +1,10 @@ package com.nflg.wms.repository.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.nflg.wms.common.pojo.qo.InventorySearchQO; +import com.nflg.wms.common.pojo.vo.InventoryVO; import com.nflg.wms.repository.entity.WmsInventory; /** @@ -13,4 +17,5 @@ import com.nflg.wms.repository.entity.WmsInventory; */ public interface WmsInventoryMapper extends BaseMapper { + IPage search(InventorySearchQO request, Page objectPage); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsInventoryService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsInventoryService.java index 208b2c54..5c0e2011 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsInventoryService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsInventoryService.java @@ -1,8 +1,12 @@ package com.nflg.wms.repository.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.nflg.wms.common.pojo.dto.InventoryDTO; +import com.nflg.wms.common.pojo.qo.InventorySearchQO; +import com.nflg.wms.common.pojo.vo.InventoryVO; import com.nflg.wms.repository.entity.WmsInventory; +import jakarta.validation.Valid; import java.util.List; @@ -19,4 +23,6 @@ public interface IWmsInventoryService extends IService { void out(List inventories); void in(List inventories); + + IPage search(@Valid InventorySearchQO request); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInventoryServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInventoryServiceImpl.java index 65b1adf7..2e14e989 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInventoryServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInventoryServiceImpl.java @@ -2,9 +2,13 @@ package com.nflg.wms.repository.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nflg.wms.common.exception.NflgException; import com.nflg.wms.common.pojo.dto.InventoryDTO; +import com.nflg.wms.common.pojo.qo.InventorySearchQO; +import com.nflg.wms.common.pojo.vo.InventoryVO; import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.common.util.VUtil; import com.nflg.wms.repository.entity.WmsInventory; @@ -103,4 +107,9 @@ public class WmsInventoryServiceImpl extends ServiceImpl search(InventorySearchQO request) { + return baseMapper.search(request, new Page<>(request.getPage(), request.getPageSize())); + } } diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsInventoryMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsInventoryMapper.xml index c50c0a39..4d6a1414 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsInventoryMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsInventoryMapper.xml @@ -2,4 +2,25 @@ +