From f4f7c8b1932be5a4606037c7cb44916e2a63cdbd Mon Sep 17 00:00:00 2001 From: wanghao Date: Mon, 12 Jan 2026 13:27:13 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E8=87=AA=E5=BB=BA=E7=89=A9?= =?UTF-8?q?=E6=96=99=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=EF=BC=8C=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=89=80=E5=B1=9E=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/wms/domain/WmsBaseProduct.java | 2 ++ .../dromara/wms/domain/bo/WmsBaseProductBo.java | 1 - .../dromara/wms/domain/vo/WmsBaseProductVo.java | 2 ++ .../dromara/wms/mapper/WmsBaseProductMapper.java | 16 ++++++++++++---- .../service/impl/WmsBaseProductServiceImpl.java | 14 +++++++++++--- 5 files changed, 27 insertions(+), 8 deletions(-) diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/WmsBaseProduct.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/WmsBaseProduct.java index e3bba157..09c0de71 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/WmsBaseProduct.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/WmsBaseProduct.java @@ -80,6 +80,8 @@ public class WmsBaseProduct extends TenantEntity { @TableField(exist = false) private String createByName; @TableField(exist = false) + private String deptName;//部门名称 + @TableField(exist = false) private String updateByName; diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/bo/WmsBaseProductBo.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/bo/WmsBaseProductBo.java index 073e7241..deac464b 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/bo/WmsBaseProductBo.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/bo/WmsBaseProductBo.java @@ -69,5 +69,4 @@ public class WmsBaseProductBo extends BaseEntity { private String activeFlag; private String externalBrand; - } diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/vo/WmsBaseProductVo.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/vo/WmsBaseProductVo.java index a3e512d5..8a29f047 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/vo/WmsBaseProductVo.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/vo/WmsBaseProductVo.java @@ -126,4 +126,6 @@ public class WmsBaseProductVo implements Serializable { private String unitName; private String createByName; private String updateByName; + + private String deptName;//部门名称 } diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/WmsBaseProductMapper.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/WmsBaseProductMapper.java index c0000eab..2c71eeb6 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/WmsBaseProductMapper.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/WmsBaseProductMapper.java @@ -1,15 +1,18 @@ package org.dromara.wms.mapper; -import java.util.List; -import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.ibatis.annotations.Param; +import org.dromara.common.mybatis.annotation.DataColumn; +import org.dromara.common.mybatis.annotation.DataPermission; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.wms.domain.WmsBaseProduct; import org.dromara.wms.domain.vo.WmsBaseProductVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.springframework.stereotype.Repository; +import java.util.List; + /** * 海威成品信息Mapper接口 * @@ -35,5 +38,10 @@ public interface WmsBaseProductMapper extends BaseMapperPlus selectCustomWmsBaseProductVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); - + // + // @DataPermission({@DataColumn(key = "deptName", value = "t.dept_id")}) + // default List selectVoList(MPJLambdaWrapper lqw) { + // System.out.println("lqw = " + lqw); + // return BaseMapperPlus.super.selectVoList(lqw); + // } } diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsBaseProductServiceImpl.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsBaseProductServiceImpl.java index 15b0ae6e..53dc6dd6 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsBaseProductServiceImpl.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsBaseProductServiceImpl.java @@ -6,10 +6,12 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper; import lombok.RequiredArgsConstructor; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.annotation.DataColumn; +import org.dromara.common.mybatis.annotation.DataPermission; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.wms.domain.BaseUnitInfo; +import org.dromara.wms.domain.SysDept; import org.dromara.wms.domain.SysUser; import org.dromara.wms.domain.WmsBaseProduct; import org.dromara.wms.domain.bo.WmsBaseProductBo; @@ -51,6 +53,7 @@ public class WmsBaseProductServiceImpl implements IWmsBaseProductService { * @param pageQuery 分页参数 * @return 海威成品信息分页列表 */ + @DataPermission({@DataColumn(key = "deptName", value = "t.create_dept")}) @Override public TableDataInfo queryPageList(WmsBaseProductBo bo, PageQuery pageQuery) { MPJLambdaWrapper lqw = buildQueryWrapper(bo); @@ -64,7 +67,7 @@ public class WmsBaseProductServiceImpl implements IWmsBaseProductService { * @param bo 查询条件 * @return 海威成品信息列表 */ - @Override + @Override public List queryList(WmsBaseProductBo bo) { MPJLambdaWrapper lqw = buildQueryWrapper(bo); return baseMapper.selectVoList(lqw); @@ -79,11 +82,16 @@ public class WmsBaseProductServiceImpl implements IWmsBaseProductService { .like(StringUtils.isNotBlank(bo.getProductName()), WmsBaseProduct::getProductName, bo.getProductName()) .like(StringUtils.isNotBlank(bo.getExternalBrand()), WmsBaseProduct::getExternalBrand, bo.getExternalBrand()) .eq(StringUtils.isNotBlank(bo.getActiveFlag()), WmsBaseProduct::getActiveFlag, bo.getActiveFlag()) + .eq(bo.getCreateDept() !=null, WmsBaseProduct::getCreateDept, bo.getCreateDept()) + // 创建人 .leftJoin(SysUser.class, SysUser::getUserId, WmsBaseProduct::getCreateBy) .selectAs(SysUser::getNickName, WmsBaseProduct::getCreateByName) + // 更新人 .leftJoin(SysUser.class, SysUser::getUserId, WmsBaseProduct::getUpdateBy) .selectAs(SysUser::getNickName, WmsBaseProduct::getUpdateByName) - ; + // 部门 + .leftJoin(SysDept.class, SysDept::getDeptId, WmsBaseProduct::getCreateDept) + .selectAs(SysDept::getDeptName, WmsBaseProduct::getDeptName); }