From 8dda7c17b699061f6e33e54f1117e14b57951aea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 31 Mar 2026 10:22:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=82=A8=E5=8A=A8=E6=80=81=E8=A1=A8?= =?UTF-8?q?=E5=8D=95;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../facade/ISysTableConfigService.java | 4 ++-- .../mapper/SysTableConfigMapper.java | 10 ++++----- .../SysTableConfigServiceImpl.java | 21 +++++++++++++------ .../sysTableConfig/SysTableConfigApi.java | 8 ++++--- .../sysTableConfig/SysTableConfigMapper.xml | 3 +++ 5 files changed, 30 insertions(+), 16 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/sysTableConfig/repository/facade/ISysTableConfigService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/sysTableConfig/repository/facade/ISysTableConfigService.java index 3da3dee51..b7b3690fe 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/sysTableConfig/repository/facade/ISysTableConfigService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/sysTableConfig/repository/facade/ISysTableConfigService.java @@ -25,14 +25,14 @@ public interface ISysTableConfigService extends IService { * @param key 配置键 * @return 配置信息 */ - SysTableConfig getByOrgIdAndKey(Long organizationId, String key); + SysTableConfig getByOrgIdAndKey(Long organizationId, String key,Long warehouseId); /** * 根据组织 ID 查询所有配置 * @param organizationId 组织 ID * @return 配置列表 */ - List listByOrgId(Long organizationId); + List listByOrgId(Long organizationId,Long warehouseId); /** * 保存或更新配置（根据组织 ID 和键判断是新增还是更新） diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/sysTableConfig/repository/mapper/SysTableConfigMapper.java b/mhd_wms/src/main/java/com/mhd/wms/domain/sysTableConfig/repository/mapper/SysTableConfigMapper.java index a2aaa6902..6c66204c6 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/sysTableConfig/repository/mapper/SysTableConfigMapper.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/sysTableConfig/repository/mapper/SysTableConfigMapper.java @@ -23,16 +23,16 @@ public interface SysTableConfigMapper extends BaseMapper { * @param key 配置键 * @return 配置信息 */ - @Select("SELECT * FROM sys_table_config WHERE organization_id = #{organizationId} AND key = #{key}") - SysTableConfig getByOrgIdAndKey(@Param("organizationId") Long organizationId, @Param("key") String key); + @Select("SELECT * FROM sys_table_config WHERE organization_id = #{organizationId} AND key = #{key} and warehouse_id = #{warehouseId}") + SysTableConfig getByOrgIdAndKey(@Param("organizationId") Long organizationId, @Param("key") String key, @Param("warehouseId") Long warehouseId); /** * 根据组织 ID 查询所有配置 * @param organizationId 组织 ID * @return 配置列表 */ - @Select("SELECT * FROM sys_table_config WHERE organization_id = #{organizationId} ORDER BY create_time DESC") - List listByOrgId(@Param("organizationId") Long organizationId); + @Select("SELECT * FROM sys_table_config WHERE organization_id = #{organizationId} and warehouse_id = #{warehouseId} ORDER BY create_time DESC") + List listByOrgId(@Param("organizationId") Long organizationId, @Param("warehouseId") Long warehouseId); /** * 分页查询配置列表 @@ -43,5 +43,5 @@ public interface SysTableConfigMapper extends BaseMapper { */ List queryList(Page page, @Param("organizationId") Long organizationId, - @Param("key") String key); + @Param("key") String key, @Param("warehouseId") Long warehouseId); } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/sysTableConfig/repository/persistence/SysTableConfigServiceImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/sysTableConfig/repository/persistence/SysTableConfigServiceImpl.java index 3e043c6f2..37cd39df7 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/sysTableConfig/repository/persistence/SysTableConfigServiceImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/sysTableConfig/repository/persistence/SysTableConfigServiceImpl.java @@ -41,24 +41,30 @@ public class SysTableConfigServiceImpl extends ServiceImpl list = sysTableConfigMapper.queryList(page, sysTableConfigDTO.getOrganizationId() != null ? sysTableConfigDTO.getOrganizationId().longValue() : null, - sysTableConfigDTO.getKey()); + sysTableConfigDTO.getKey(), sysTableConfigDTO.getWarehouseId()); return page.setRecords(list); } @Override - public SysTableConfig getByOrgIdAndKey(Long organizationId, String key) { + public SysTableConfig getByOrgIdAndKey(Long organizationId, String key,Long warehouseId) { if (organizationId == null || StringUtils.isBlank(key)) { throw new ServiceException("组织 ID 和键不能为空"); } - return sysTableConfigMapper.getByOrgIdAndKey(organizationId, key); + if (warehouseId == null) { + throw new ServiceException("仓库 ID 不能为空"); + } + return sysTableConfigMapper.getByOrgIdAndKey(organizationId, key,warehouseId); } @Override - public List listByOrgId(Long organizationId) { + public List listByOrgId(Long organizationId, Long warehouseId) { if (organizationId == null) { throw new ServiceException("组织 ID 不能为空"); } - return sysTableConfigMapper.listByOrgId(organizationId); + if (warehouseId == null) { + throw new ServiceException("仓库 ID 不能为空"); + } + return sysTableConfigMapper.listByOrgId(organizationId, warehouseId); } @Override @@ -73,6 +79,9 @@ public class SysTableConfigServiceImpl extends ServiceImpl getByOrgIdAndKey(@RequestParam(name="organizationId") Long organizationId, + @RequestParam(name="warehouseId") Long warehouseId, @RequestParam(name="key") String key) { try { - SysTableConfig config = sysTableConfigService.getByOrgIdAndKey(organizationId, key); + SysTableConfig config = sysTableConfigService.getByOrgIdAndKey(organizationId, key, warehouseId); if (config == null) { return Result.error("未找到对应配置"); } @@ -91,9 +92,10 @@ public class SysTableConfigApi extends BaseController { */ @ApiOperation(value = "系统表配置 - 根据组织 ID 查询所有配置", notes = "系统表配置 - 根据组织 ID 查询所有配置") @GetMapping(value = "/listByOrgId") - public Result listByOrgId(@RequestParam(name="organizationId") Long organizationId) { + public Result listByOrgId(@RequestParam(name="organizationId") Long organizationId, + @RequestParam(name="warehouseId") Long warehouseId) { try { - List list = sysTableConfigService.listByOrgId(organizationId); + List list = sysTableConfigService.listByOrgId(organizationId, warehouseId); return Result.ok(list); } catch (Exception e) { log.error(e.getMessage(), e); diff --git a/mhd_wms/src/main/resources/mapper/sysTableConfig/SysTableConfigMapper.xml b/mhd_wms/src/main/resources/mapper/sysTableConfig/SysTableConfigMapper.xml index 3d9730950..e61bb75a2 100644 --- a/mhd_wms/src/main/resources/mapper/sysTableConfig/SysTableConfigMapper.xml +++ b/mhd_wms/src/main/resources/mapper/sysTableConfig/SysTableConfigMapper.xml @@ -25,6 +25,9 @@ AND a.organization_id = #{organizationId} + + AND a.warehouse_id = #{warehouseId} + AND a.key LIKE CONCAT('%', #{key}, '%')