From 3d0cab34efff98e6df491055e4e20ed8d33ffe43 Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Thu, 4 Sep 2025 15:13:32 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E5=87=BA=E5=BA=93=E5=8D=95?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=A2=E6=88=B7=E5=90=8D=E7=A7=B0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=B9=B6=E4=BC=98=E5=8C=96=E4=BB=93=E5=BA=93=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 WmsOutstockOrder 模型中添加 customerName 字段 - 在 WmsOutstockOrderBo 中添加 customerName 字段并进行校验 - 在 WmsOutstockOrderServiceImpl 中实现客户名称的关联查询 - 在 WmsOutstockOrderVo 中添加 customerName 字段用于展示 - 优化仓库选择界面的错误提示信息 --- .../java/org/dromara/wms/domain/WmsOutstockOrder.java | 6 ++++++ .../org/dromara/wms/domain/bo/WmsOutstockOrderBo.java | 8 ++++++-- .../org/dromara/wms/domain/vo/WmsOutstockOrderVo.java | 5 +++++ .../wms/service/impl/WmsOutstockOrderServiceImpl.java | 9 +++++++-- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsOutstockOrder.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsOutstockOrder.java index 6b928e9e..d1bcb34a 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsOutstockOrder.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsOutstockOrder.java @@ -119,4 +119,10 @@ public class WmsOutstockOrder { @TableField(exist = false) private String warehouseName;//字段映射 + /** + * 客户名称 + */ + @TableField(exist = false) + private String customerName; + } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsOutstockOrderBo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsOutstockOrderBo.java index 8a36c18b..41166290 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsOutstockOrderBo.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsOutstockOrderBo.java @@ -1,8 +1,12 @@ package org.dromara.wms.domain.bo; import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.wms.domain.WmsOutstockOrder; @@ -29,7 +33,7 @@ public class WmsOutstockOrderBo extends BaseEntity { /** * 仓库ID */ -// @NotNull(message = "仓库ID不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotNull(message = "仓库不能为空", groups = { AddGroup.class, EditGroup.class }) private Long warehouseId; /** @@ -41,7 +45,7 @@ public class WmsOutstockOrderBo extends BaseEntity { /** * 出库类型 */ -// @NotBlank(message = "出库类型不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotBlank(message = "出库类型不能为空", groups = { AddGroup.class, EditGroup.class }) private String outstockType; /** diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutstockOrderVo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutstockOrderVo.java index b05e42c3..c492332c 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutstockOrderVo.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutstockOrderVo.java @@ -134,4 +134,9 @@ public class WmsOutstockOrderVo implements Serializable { */ private String warehouseName; + /** + * 客户名称 + */ + private String customerName; + } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockOrderServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockOrderServiceImpl.java index 94e26738..69bd0383 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockOrderServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockOrderServiceImpl.java @@ -12,6 +12,7 @@ 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.BaseMaterialCategory; +import org.dromara.wms.domain.WmsBaseCustomer; import org.dromara.wms.domain.WmsBaseWarehouse; import org.dromara.wms.domain.WmsOutstockOrder; import org.dromara.wms.domain.bo.WmsOutstockOrderBo; @@ -86,9 +87,13 @@ public class WmsOutstockOrderServiceImpl implements IWmsOutstockOrderService { // 关联表查询物料大类名称 .select(BaseMaterialCategory::getMaterialCategoryName) .leftJoin(BaseMaterialCategory.class, BaseMaterialCategory::getMaterialCategoryId, WmsOutstockOrder::getMaterialCategoryId) - + // 关联表查询仓库名称 .select(WmsBaseWarehouse::getWarehouseCode, WmsBaseWarehouse::getWarehouseName) - .leftJoin(WmsBaseWarehouse.class, WmsBaseWarehouse::getWarehouseId, WmsOutstockOrder::getWarehouseId); + .leftJoin(WmsBaseWarehouse.class, WmsBaseWarehouse::getWarehouseId, WmsOutstockOrder::getWarehouseId) + //关联查询客户名称 + .select(WmsBaseCustomer::getCustomerName) + .leftJoin(WmsBaseCustomer.class, WmsBaseCustomer::getCustomerId, WmsOutstockOrder::getCustomerId); + lqw.eq(bo.getOutstockId() != null, WmsOutstockOrder::getOutstockId, bo.getOutstockId()); lqw.eq(bo.getWarehouseId() != null, WmsOutstockOrder::getWarehouseId, bo.getWarehouseId());