From 885f5f1b9c8520841523aa8c28a5078d18ba6047 Mon Sep 17 00:00:00 2001 From: zch Date: Tue, 25 Feb 2025 10:48:32 +0800 Subject: [PATCH] =?UTF-8?q?change(hwmom-mes):=E7=89=A9=E6=96=99=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=A4=A7=E7=B1=BB=E5=90=8D=E7=A7=B0=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 BaseMaterialType 模型中添加物料大类名称字段 - 在 BaseMaterialTypeServiceImpl 服务中实现物料大类名称的关联查询 - 在 BaseMaterialTypeVo 视图中添加物料大类名称属性 - 注释掉物料类型列表中不再使用的工序名称相关代码 --- .../java/org/dromara/mes/domain/BaseMaterialType.java | 10 ++++++++++ .../org/dromara/mes/domain/vo/BaseMaterialTypeVo.java | 10 +++++++--- .../mes/service/impl/BaseMaterialTypeServiceImpl.java | 9 +++++++-- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialType.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialType.java index 1cf42d5c..27acd10f 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialType.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/BaseMaterialType.java @@ -80,5 +80,15 @@ public class BaseMaterialType extends TenantEntity { @TableField(exist = false) private String processName;//映射字段 + /** + * 大类编号 + */ +/* @TableField(exist = false) + private String materialCategoryCode;//映射字段*/ + /** + * 大类名称 + */ + @TableField(exist = false) + private String materialCategoryName;//映射字段 } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMaterialTypeVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMaterialTypeVo.java index 20bf198a..cdd868af 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMaterialTypeVo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/BaseMaterialTypeVo.java @@ -131,8 +131,12 @@ public class BaseMaterialTypeVo implements Serializable { /** * 工序名称 */ - @ExcelProperty(value = "工序名称") - private String processName;//工序名称 - +// @ExcelProperty(value = "工序名称") +// private String processName;//工序名称 + /** + * 大类名称 + */ + @ExcelProperty(value = "工序名称") + private String materialCategoryName;//映射字段 } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseMaterialTypeServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseMaterialTypeServiceImpl.java index 022debdb..c11a292f 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseMaterialTypeServiceImpl.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/BaseMaterialTypeServiceImpl.java @@ -8,6 +8,7 @@ import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.mes.domain.BaseMaterialCategory; import org.dromara.mes.domain.ProdBaseProcessInfo; import org.springframework.stereotype.Service; import org.dromara.mes.domain.bo.BaseMaterialTypeBo; @@ -61,8 +62,12 @@ public class BaseMaterialTypeServiceImpl implements IBaseMaterialTypeService { MPJLambdaWrapper lqw = JoinWrappers.lambda(BaseMaterialType.class) // 关联查询工序名称 - .select(ProdBaseProcessInfo::getProcessName) - .leftJoin(ProdBaseProcessInfo.class, ProdBaseProcessInfo::getProcessId, BaseMaterialType::getProcessId) +// .select(ProdBaseProcessInfo::getProcessName) +// .leftJoin(ProdBaseProcessInfo.class, ProdBaseProcessInfo::getProcessId, BaseMaterialType::getProcessId) + + // 关联查询物料大类名称 + .select(BaseMaterialCategory::getMaterialCategoryName) + .leftJoin(BaseMaterialCategory.class, BaseMaterialCategory::getMaterialCategoryId, BaseMaterialType::getMaterialCategoryId) .selectAll(BaseMaterialType.class) .eq(bo.getMatrialTypeId() != null, BaseMaterialType::getMatrialTypeId, bo.getMatrialTypeId())