From 882aa8740e043affd67525a5c3a4c135b8890170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Wed, 22 Apr 2026 15:21:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?bug=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ssociationWarehouseApplicationService.java | 41 ++----------------- .../persistence/AssociationWarehouseImpl.java | 15 ++++++- .../AssociationWarehouseApi.java | 6 +-- .../AssociationWarehouseMapper.xml | 3 ++ 4 files changed, 23 insertions(+), 42 deletions(-) diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/associationWarehouse/AssociationWarehouseApplicationService.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/associationWarehouse/AssociationWarehouseApplicationService.java index fe77199d9..21ca62aba 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/associationWarehouse/AssociationWarehouseApplicationService.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/associationWarehouse/AssociationWarehouseApplicationService.java @@ -17,7 +17,6 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; -import java.util.Objects; import java.util.stream.Collectors; /** @@ -73,36 +72,6 @@ public class AssociationWarehouseApplicationService { } } - /** - * 排除「默认仓」关联（is_default=2），与 Mapper 条件双保险，避免 OGNL/参数未绑定导致仍查出默认行。 - */ - private List filterExcludeDefaultWarehouse( - AssociationWarehouseDO associationWarehouseDO, - List list) { - if (!Boolean.TRUE.equals(associationWarehouseDO.getExcludeDefaultWarehouse()) - || list == null || list.isEmpty()) { - return list; - } - return list.stream() - .filter(po -> po.getIsDefault() == null || !Objects.equals(po.getIsDefault(), 2)) - .collect(Collectors.toList()); - } - - /** - * 按「组织 + 仓库」查该仓下全部绑定（未带 correlationId）时，默认排除新建仓自动产生的默认仓关联（is_default=2）。 - * 需要保留时显式传 excludeDefaultWarehouse=false。 - * 仅在没有显式指定 excludeDefaultWarehouse 时生效。 - */ - private void applyDefaultExcludeForWarehouseBindList(AssociationWarehouseDO associationWarehouseDO) { - if (associationWarehouseDO.getExcludeDefaultWarehouse() != null) { - return; - } - if (associationWarehouseDO.getWarehouseId() != null - && associationWarehouseDO.getCorrelationId() == null) { - associationWarehouseDO.setExcludeDefaultWarehouse(true); - } - } - /** * 分页查询关联仓库列表 */ @@ -128,16 +97,14 @@ public class AssociationWarehouseApplicationService { associationWarehousePO.setTopOrganizationId(warehousePO.getTopOrganizationId()); associationWarehousePOList.add(associationWarehousePO); }); - return filterExcludeDefaultWarehouse(associationWarehouseDO, associationWarehousePOList); + return associationWarehousePOList; }else { applyAssociationWarehouseOrgScope(associationWarehouseDO, loginUser); // 未指定仓库时：只查当前登录人在关联表中的记录；指定了 warehouseId 时：查该仓下全部绑定（绑定用户列表），勿收窄为当前用户 if (associationWarehouseDO.getWarehouseId() == null) { associationWarehouseDO.setCorrelationId(loginUser.getUserid()); } - applyDefaultExcludeForWarehouseBindList(associationWarehouseDO); - return filterExcludeDefaultWarehouse(associationWarehouseDO, - associationWarehouseDomainService.queryList(associationWarehouseDO)); + return associationWarehouseDomainService.queryList(associationWarehouseDO); } } @@ -146,9 +113,7 @@ public class AssociationWarehouseApplicationService { if (loginUser != null && loginUser.getUserPo() != null) { applyAssociationWarehouseOrgScope(associationWarehouseDO, loginUser); } - applyDefaultExcludeForWarehouseBindList(associationWarehouseDO); - List associationWarehousePOList = filterExcludeDefaultWarehouse(associationWarehouseDO, - associationWarehouseDomainService.queryList(associationWarehouseDO)); + List associationWarehousePOList = associationWarehouseDomainService.queryList(associationWarehouseDO); return associationWarehousePOList.stream() .map(AssociationWarehousePO::getCorrelationId) .collect(Collectors.toList()); diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/associationWarehouse/repository/persistence/AssociationWarehouseImpl.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/associationWarehouse/repository/persistence/AssociationWarehouseImpl.java index c50c93e9d..dc3fc8eb6 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/associationWarehouse/repository/persistence/AssociationWarehouseImpl.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/associationWarehouse/repository/persistence/AssociationWarehouseImpl.java @@ -133,17 +133,30 @@ public class AssociationWarehouseImpl extends ServiceImpl list = new ArrayList<>(); for (Long id : associationWarehouseIds) { + if (id == null) { + continue; + } + AssociationWarehouse row = this.getById(id); + if (row == null) { + continue; + } + if (row.getIsDefault() != null && row.getIsDefault() == 2) { + continue; + } AssociationWarehouse associationWarehouse = new AssociationWarehouse(); associationWarehouse.setAssociationWarehouseId(id); associationWarehouse.setDelFlag(2); list.add(associationWarehouse); } + if (list.isEmpty()) { + return Boolean.TRUE; + } return this.updateBatchById(list); } diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facadeApi/associationWarehouse/AssociationWarehouseApi.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facadeApi/associationWarehouse/AssociationWarehouseApi.java index e3616e2dd..2858b2787 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facadeApi/associationWarehouse/AssociationWarehouseApi.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facadeApi/associationWarehouse/AssociationWarehouseApi.java @@ -40,9 +40,9 @@ public class AssociationWarehouseApi extends BaseController{ private AssociationWarehouseAssembler associationWarehouseAssembler; /** - * 分页查询关联仓库列表。按组织+仓库(warehouseId)查该仓全部绑定时，默认不返回 is_default=2（默认仓）关联行；需要含该条时传 excludeDefaultWarehouse=false。 + * 分页查询关联仓库列表；含 is_default=2 的默认仓关联。删除时此类记录不可删。 */ - @ApiOperation("查询关联仓库列表（按仓查绑定时默认不含 is_default=2）") + @ApiOperation("查询关联仓库列表") @GetMapping("/list") public AjaxResult list(AssociationWarehouseDTO associationWarehouseDTO) { @@ -52,7 +52,7 @@ public class AssociationWarehouseApi extends BaseController{ return AjaxResult.success(list); } - @ApiOperation("查询仓库关联的用户 id 集合（按仓查时默认不含仅 is_default=2 的绑定）") + @ApiOperation("查询仓库关联的用户 id 集合") @GetMapping("/queryListCorrelationId") public AjaxResult listUser(AssociationWarehouseDTO associationWarehouseDTO) { diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/associationWarehouse/AssociationWarehouseMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/associationWarehouse/AssociationWarehouseMapper.xml index cd2d13642..2cb017994 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/associationWarehouse/AssociationWarehouseMapper.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/associationWarehouse/AssociationWarehouseMapper.xml @@ -49,9 +49,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.warehouse_id = #{warehouseId} + + and a.warehouse_code = #{warehouseCode} From a47e5aafcafbf3650ac3b08701d28c3d46820ab6 Mon Sep 17 00:00:00 2001 From: zhaoqing <1670883518@qq.com> Date: Wed, 22 Apr 2026 15:40:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?wms-=E6=8A=84=E7=A0=81=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/copyCodeReference/CopyCodeReferenceDTO.java | 9 +++++++++ .../mapper/copyCodeReference/CopyCodeReferenceMapper.xml | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/copyCodeReference/CopyCodeReferenceDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/copyCodeReference/CopyCodeReferenceDTO.java index 1bb18d645..33deb6af3 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/copyCodeReference/CopyCodeReferenceDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/copyCodeReference/CopyCodeReferenceDTO.java @@ -15,6 +15,15 @@ public class CopyCodeReferenceDTO extends BaseVOEntity { @ApiModelProperty("ID") private Long id; + @ApiModelProperty("组织表ID") + private Long organizationId; + + @ApiModelProperty("组织名称") + private String organizationName; + + @ApiModelProperty("一级组织表ID") + private Long topOrganizationId; + @ApiModelProperty("货主ID") private Long shipperId; diff --git a/mhd_wms/src/main/resources/mapper/copyCodeReference/CopyCodeReferenceMapper.xml b/mhd_wms/src/main/resources/mapper/copyCodeReference/CopyCodeReferenceMapper.xml index 6bf467ab9..433e294d0 100644 --- a/mhd_wms/src/main/resources/mapper/copyCodeReference/CopyCodeReferenceMapper.xml +++ b/mhd_wms/src/main/resources/mapper/copyCodeReference/CopyCodeReferenceMapper.xml @@ -125,6 +125,12 @@ AND material_code = #{materialCode} AND batch_number = #{batchNumber} AND box_pallet_no = #{boxPalletNo} + + AND top_organization_id = #{topOrganizationId} + + + AND organization_id = #{organizationId} + ORDER BY serial_number