From 264ce67a97cd9a6ac1730eaac02e4cf7af2ba404 Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Mon, 8 Sep 2025 09:32:29 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E5=A2=9E=E5=8A=A0=E7=A7=BB?= =?UTF-8?q?=E5=BA=93=E8=AE=A2=E5=8D=95=E5=92=8C=E5=87=BA=E5=BA=93=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E7=9A=84=E5=85=B3=E8=81=94=E6=9F=A5=E8=AF=A2=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 WmsMoveOrder 模型中添加仓库名称和物料名称字段 - 更新 WmsMoveOrderServiceImpl 以关联查询仓库名称和物料名称 - 在 WmsMoveOrderVo 中添加仓库名称和物料名称字段 - 在 WmsOutstockRecord 模型中添加用户账号和昵称字段 - 更新 WmsOutstockRecordServiceImpl 以关联查询用户昵称和账号 - 在 WmsOutstockRecordVo 中添加用户账号和昵称字段 --- .../org/dromara/wms/domain/WmsMoveOrder.java | 13 +++++++++++++ .../dromara/wms/domain/WmsOutstockRecord.java | 12 ++++++++++++ .../dromara/wms/domain/vo/WmsMoveOrderVo.java | 18 ++++++++++++++++-- .../wms/domain/vo/WmsOutstockRecordVo.java | 10 ++++++++++ .../service/impl/WmsMoveOrderServiceImpl.java | 18 +++++++++++------- .../impl/WmsOutstockRecordServiceImpl.java | 4 ++++ 6 files changed, 66 insertions(+), 9 deletions(-) diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsMoveOrder.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsMoveOrder.java index 9239c7a4..7ca286de 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsMoveOrder.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsMoveOrder.java @@ -109,8 +109,19 @@ public class WmsMoveOrder{ private String updateBy; @TableField(fill = FieldFill.INSERT_UPDATE) private String createBy; + + /** + * 仓库名称 + */ + @TableField(exist = false) + private String warehouseName; @TableField(exist = false) private String warehouseCode; + /** + * 物料名称 + */ + @TableField(exist = false) + private String materialName; @TableField(exist = false) private String materialCode; @@ -121,4 +132,6 @@ public class WmsMoveOrder{ @TableField(exist = false) private String materialCategoryName;//字段映射 + + } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsOutstockRecord.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsOutstockRecord.java index 3721b35e..aca0c933 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsOutstockRecord.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsOutstockRecord.java @@ -110,4 +110,16 @@ public class WmsOutstockRecord extends TenantEntity { @TableField(exist = false) private String materialCategoryName;//字段映射 + /** + * 用户账号 + */ + @TableField(exist = false) + private String userName; + + /** + * 用户昵称 + */ + @TableField(exist = false) + private String nickName; + } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsMoveOrderVo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsMoveOrderVo.java index 0974c1bc..5d3ea92a 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsMoveOrderVo.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsMoveOrderVo.java @@ -129,10 +129,16 @@ public class WmsMoveOrderVo implements Serializable { */ @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateTime; + + /** + * 仓库名称 + */ + @TableField(exist = false) + private String warehouseName; @TableField(exist = false) private String warehouseCode; - @TableField(exist = false) - private String materialCode; + + /** * 物料大类 @@ -143,4 +149,12 @@ public class WmsMoveOrderVo implements Serializable { // 批次条码 插入 private String batchCode; + /** + * 物料名称 + */ + @TableField(exist = false) + private String materialName; + @TableField(exist = false) + private String materialCode; + } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutstockRecordVo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutstockRecordVo.java index 60a3097f..08238abe 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutstockRecordVo.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutstockRecordVo.java @@ -124,4 +124,14 @@ public class WmsOutstockRecordVo implements Serializable { */ private String materialCategoryName;//字段映射 + /** + * 用户账号 + */ + private String userName; + + /** + * 用户昵称 + */ + private String nickName; + } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsMoveOrderServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsMoveOrderServiceImpl.java index d8107774..1e191681 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsMoveOrderServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsMoveOrderServiceImpl.java @@ -10,7 +10,10 @@ import org.dromara.common.core.utils.StringUtils; 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.*; +import org.dromara.wms.domain.BaseMaterialInfo; +import org.dromara.wms.domain.WmsBaseWarehouse; +import org.dromara.wms.domain.WmsInventory; +import org.dromara.wms.domain.WmsMoveOrder; import org.dromara.wms.domain.bo.WmsMoveOrderBo; import org.dromara.wms.domain.vo.WmsInventoryVo; import org.dromara.wms.domain.vo.WmsMoveOrderVo; @@ -79,14 +82,15 @@ public class WmsMoveOrderServiceImpl implements IWmsMoveOrderService { private MPJLambdaWrapper buildQueryWrapper(WmsMoveOrderBo bo) { Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(WmsMoveOrder.class) - + .selectAll(WmsMoveOrder.class) // 关联表查询物料大类名称 - .select(BaseMaterialCategory::getMaterialCategoryName) - .leftJoin(BaseMaterialCategory.class, BaseMaterialCategory::getMaterialCategoryId, WmsMoveOrder::getMaterialCategoryId) - - .selectAll(WmsMoveOrder.class).select(WmsBaseWarehouse::getWarehouseCode).select(BaseMaterialInfo::getMaterialCode) +// .select(BaseMaterialCategory::getMaterialCategoryName) + // 关联表查询仓库名称 + .select(WmsBaseWarehouse::getWarehouseCode, WmsBaseWarehouse::getWarehouseName) .leftJoin(WmsBaseWarehouse.class,WmsBaseWarehouse::getWarehouseId,WmsMoveOrder::getWarehouseId) - .leftJoin(BaseMaterialInfo.class,BaseMaterialInfo::getMaterialId,WmsMoveOrder::getMaterialId) + .select(BaseMaterialInfo::getMaterialCode,BaseMaterialInfo::getMaterialName) + .leftJoin(BaseMaterialInfo.class,BaseMaterialInfo::getMaterialId,WmsMoveOrder::getMaterialId) + .eq(bo.getMoveId() != null, WmsMoveOrder::getMoveId, bo.getMoveId()) .eq(bo.getMaterialId() != null, WmsMoveOrder::getMaterialId, bo.getMaterialId()) .eq(StringUtils.isNotBlank(bo.getMaterialCategoryId()), WmsMoveOrder::getMaterialCategoryId, bo.getMaterialCategoryId()) diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockRecordServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockRecordServiceImpl.java index c61f5a26..06ff24b5 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockRecordServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockRecordServiceImpl.java @@ -10,6 +10,7 @@ import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.wms.domain.BaseMaterialCategory; import org.dromara.wms.domain.BaseMaterialInfo; +import org.dromara.wms.domain.SysUser; import org.dromara.wms.domain.WmsOutstockRecord; import org.dromara.wms.domain.bo.WmsOutstockRecordBo; import org.dromara.wms.domain.bo.WmsReturnOrderBo; @@ -86,6 +87,9 @@ public class WmsOutstockRecordServiceImpl implements IWmsOutstockRecordService { // 关联表查询物料大类名称 .select(BaseMaterialCategory::getMaterialCategoryName) .leftJoin(BaseMaterialCategory.class, BaseMaterialCategory::getMaterialCategoryId, WmsOutstockRecord::getMaterialCategoryId) + // + .select(SysUser::getNickName, SysUser::getUserName) + .leftJoin(SysUser.class, SysUser::getUserId, WmsOutstockRecord::getCreateBy) .select(BaseMaterialInfo::getMaterialCode, BaseMaterialInfo::getMaterialName,BaseMaterialInfo::getMaterialUnit,BaseMaterialInfo::getMaterialSpec) .leftJoin(BaseMaterialInfo.class,BaseMaterialInfo::getMaterialId,WmsOutstockRecord::getMaterialId)