From 6c79973c133c71f73a69c3ee5ce1a1a063e1cc9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 1 Dec 2025 13:55:46 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20bug-954=20=E5=82=A8=E4=BD=8D=E5=8F=AF?= =?UTF-8?q?=E8=A7=86=E5=8C=96=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/admin/controller/BinController.java | 10 +++++++ .../admin/service/BinControllerService.java | 5 ++++ .../wms/common/pojo/vo/BinInventoryVO.java | 26 +++++++++++++++++++ .../wms/repository/mapper/WmsBinMapper.java | 3 +++ .../repository/service/IWmsBinService.java | 3 +++ .../service/impl/WmsBinServiceImpl.java | 6 +++++ .../main/resources/mapper/WmsBinMapper.xml | 11 ++++++++ 7 files changed, 64 insertions(+) create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/BinInventoryVO.java diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/BinController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/BinController.java index 83f98176..263bd7e4 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/BinController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/BinController.java @@ -7,6 +7,7 @@ import com.nflg.wms.common.pojo.qo.BinAddQO; import com.nflg.wms.common.pojo.qo.BinSearchQO; import com.nflg.wms.common.pojo.qo.BinUpdateQO; import com.nflg.wms.common.pojo.qo.EnableQO; +import com.nflg.wms.common.pojo.vo.BinInventoryVO; import com.nflg.wms.common.pojo.vo.BinVO; import com.nflg.wms.starter.BaseController; import jakarta.annotation.Resource; @@ -113,4 +114,13 @@ public class BinController extends BaseController { public void exportPdf(HttpServletResponse response, @Valid @RequestBody @NotEmpty List ids) throws Exception { binControllerService.exportPdf(response, ids); } + + /** + * 获取库存信息 + * @param warehouseId 仓库id + */ + @GetMapping("getInventory") + public ApiResult> getInventory(@RequestParam Long warehouseId) { + return ApiResult.success(binControllerService.getInventory(warehouseId)); + } } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/BinControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/BinControllerService.java index 75c5290b..70e63876 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/BinControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/BinControllerService.java @@ -18,6 +18,7 @@ import com.nflg.wms.common.pojo.qo.BinAddQO; import com.nflg.wms.common.pojo.qo.BinSearchQO; import com.nflg.wms.common.pojo.qo.BinUpdateQO; import com.nflg.wms.common.pojo.qo.EnableQO; +import com.nflg.wms.common.pojo.vo.BinInventoryVO; import com.nflg.wms.common.pojo.vo.BinVO; import com.nflg.wms.common.util.DateTimeUtil; import com.nflg.wms.common.util.EecExcelUtil; @@ -210,4 +211,8 @@ public class BinControllerService { String html = ThymeleafUtil.generator("/template/", "储位二维码", ".html", variables); PdfGeneratorUtil.generatePdf("储位二维码", html, response); } + + public List getInventory(Long warehouseId) { + return wmsBinService.getInventory(warehouseId); + } } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/BinInventoryVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/BinInventoryVO.java new file mode 100644 index 00000000..5aea4688 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/BinInventoryVO.java @@ -0,0 +1,26 @@ +package com.nflg.wms.common.pojo.vo; + +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class BinInventoryVO { + + private Long id; + + /** + * 储位编码 + */ + private String no; + + /** + * 物料编码 + */ + private String materialNo; + + /** + * 数量 + */ + private BigDecimal num; +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsBinMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsBinMapper.java index a2816d44..b49a6e0d 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsBinMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsBinMapper.java @@ -4,6 +4,7 @@ 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.BinSearchQO; +import com.nflg.wms.common.pojo.vo.BinInventoryVO; import com.nflg.wms.common.pojo.vo.BinVO; import com.nflg.wms.repository.entity.WmsBin; import org.apache.ibatis.annotations.Param; @@ -25,4 +26,6 @@ public interface WmsBinMapper extends BaseMapper { List getList(List ids); List searchNonPage(@Param("request") BinSearchQO request); + + List getInventory(Long warehouseId); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsBinService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsBinService.java index 48d8f15c..7a56db66 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsBinService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsBinService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.nflg.wms.common.pojo.qo.BinSearchQO; import com.nflg.wms.common.pojo.qo.EnableQO; +import com.nflg.wms.common.pojo.vo.BinInventoryVO; import com.nflg.wms.common.pojo.vo.BinVO; import com.nflg.wms.repository.entity.WmsBin; import jakarta.validation.Valid; @@ -34,4 +35,6 @@ public interface IWmsBinService extends IService { List getList(List ids); List searchNonPage(@Valid BinSearchQO request); + + List getInventory(Long warehouseId); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsBinServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsBinServiceImpl.java index 3e099f80..f74b94f6 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsBinServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsBinServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nflg.wms.common.pojo.qo.BinSearchQO; import com.nflg.wms.common.pojo.qo.EnableQO; +import com.nflg.wms.common.pojo.vo.BinInventoryVO; import com.nflg.wms.common.pojo.vo.BinVO; import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.common.util.VUtil; @@ -105,4 +106,9 @@ public class WmsBinServiceImpl extends ServiceImpl impleme public List searchNonPage(BinSearchQO request) { return baseMapper.searchNonPage(request); } + + @Override + public List getInventory(Long warehouseId) { + return baseMapper.getInventory(warehouseId); + } } diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsBinMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsBinMapper.xml index 11feb8c5..69a597d6 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsBinMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsBinMapper.xml @@ -36,4 +36,15 @@ order by bin.id desc + +