From 1e8a82388773898dd55f1856959880890db6fe3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Mon, 9 Feb 2026 17:31:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=88=86=E9=85=8D=E6=97=B6?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BA=86=E5=85=B6=E4=BB=96=E8=B4=A7=E4=B8=BB?= =?UTF-8?q?=E7=9A=84=E5=BA=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../materialInventory/MaterialInventoryApi.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialInventory/MaterialInventoryApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialInventory/MaterialInventoryApi.java index 5ed1a840f..a306612b0 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialInventory/MaterialInventoryApi.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialInventory/MaterialInventoryApi.java @@ -1,5 +1,6 @@ package com.mhd.wms.interfaces.facadeApi.materialInventory; +import com.mhd.common.core.utils.StringUtils; import com.mhd.common.core.web.controller.BaseController; import com.mhd.common.core.web.domain.AjaxResult; import com.mhd.common.core.web.page.TableDataInfo; @@ -38,8 +39,14 @@ public class MaterialInventoryApi extends BaseController { */ @ApiOperation("查询物料库存列表") @GetMapping("/list") - public TableDataInfo list(MaterialInventoryDTO materialInventoryDTO) + public TableDataInfo list(MaterialInventoryDTO materialInventoryDTO, + @RequestParam(value = "customerName", required = false) String customerName) { + // 出库分配前端传的是客户名称 customerName，这里转成货主筛选条件（模糊匹配货主编码 / 名称） + if (StringUtils.isNotBlank(customerName) && StringUtils.isBlank(materialInventoryDTO.getShipperInfo())) { + materialInventoryDTO.setShipperInfo(customerName); + } + //转换实体 MaterialInventoryDO materialInventoryDO = materialInventoryAssembler.toDO(materialInventoryDTO); startPage();