From c2828ad8e8b822232daa4c0c58fb01d175b1746e Mon Sep 17 00:00:00 2001 From: zch Date: Thu, 6 Mar 2025 13:39:58 +0800 Subject: [PATCH] =?UTF-8?q?change(mes):=20=E4=BA=A7=E5=87=BA=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0=E7=89=A9=E6=96=99?= =?UTF-8?q?=E3=80=81=E6=9C=BA=E5=8F=B0=E3=80=81=E5=B7=A5=E8=A3=85=E3=80=81?= =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 ProdOutputScanInfo 模型中添加物料、机台、工装、工序名称字段 - 更新前端表格显示，将 ID 列替换为对应的名称列 - 修改后端查询逻辑，加入连表查询以获取名称信息 --- .../mes/domain/ProdOutputScanInfo.java | 25 +++++++++++++++ .../mes/domain/vo/ProdOutputScanInfoVo.java | 23 +++++++++++++ .../impl/ProdOutputScanInfoServiceImpl.java | 32 ++++++++++++++----- 3 files changed, 72 insertions(+), 8 deletions(-) diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdOutputScanInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdOutputScanInfo.java index ff7d2b60..09a7a919 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdOutputScanInfo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdOutputScanInfo.java @@ -68,4 +68,29 @@ public class ProdOutputScanInfo extends TenantEntity { private String remark; + /** + * 物料名称 + */ + @TableField(exist = false) + private String materialName;//join映射字段 + + /** + * 机台名称 + */ + @TableField(exist = false) + private String machineName;//join映射字段 + + /** + * 工装名称 + */ + @TableField(exist = false) + private String toolingName;//join映射字段 + + /** + * 工序名称 + */ + @TableField(exist = false) + private String processName;//join映射字段 + + } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdOutputScanInfoVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdOutputScanInfoVo.java index f3980008..15287807 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdOutputScanInfoVo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdOutputScanInfoVo.java @@ -79,5 +79,28 @@ public class ProdOutputScanInfoVo implements Serializable { @ExcelProperty(value = "备注") private String remark; + /** + * 物料名称 + */ + @ExcelProperty(value = "物料名称") + private String materialName;//join映射字段 + + /** + * 机台名称 + */ + @ExcelProperty(value = "机台名称") + private String machineName;//join映射字段 + + /** + * 工装名称 + */ + @ExcelProperty(value = "工装名称") + private String toolingName;//join映射字段 + + /** + * 工序名称 + */ + @ExcelProperty(value = "工序名称") + private String processName;//join映射字段 } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdOutputScanInfoServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdOutputScanInfoServiceImpl.java index 864b16c2..0915505f 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdOutputScanInfoServiceImpl.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdOutputScanInfoServiceImpl.java @@ -1,24 +1,23 @@ package org.dromara.mes.service.impl; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; +import org.dromara.common.core.utils.MapstructUtils; +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.mes.domain.*; import org.dromara.mes.domain.bo.ProdOutputScanInfoBo; import org.dromara.mes.domain.vo.ProdOutputScanInfoVo; -import org.dromara.mes.domain.ProdOutputScanInfo; import org.dromara.mes.mapper.ProdOutputScanInfoMapper; import org.dromara.mes.service.IProdOutputScanInfoService; +import org.springframework.stereotype.Service; +import java.util.Collection; import java.util.List; import java.util.Map; -import java.util.Collection; /** * 生产产出扫描信息Service业务层处理 @@ -73,6 +72,23 @@ public class ProdOutputScanInfoServiceImpl implements IProdOutputScanInfoService Map params = bo.getParams(); MPJLambdaWrapper lqw = JoinWrappers.lambda(ProdOutputScanInfo.class) .selectAll(ProdOutputScanInfo.class) + + //物料连表查询名称 + .select(BaseMaterialInfo::getMaterialName) + .leftJoin(BaseMaterialInfo.class, BaseMaterialInfo::getMaterialId, ProdOutputScanInfo::getMaterielId) + + //工装连表查询名称 + .select(BaseToolingInfo::getToolingName) + .leftJoin(BaseToolingInfo.class, BaseToolingInfo::getToolingId, ProdOutputScanInfo::getToolingId) + + //机台连表查询名称 + .select(ProdBaseMachineInfo::getMachineName) + .leftJoin(ProdBaseMachineInfo.class, ProdBaseMachineInfo::getMachineId, ProdOutputScanInfo::getMachineId) + + //工序连表查询名称 + .select(ProdBaseProcessInfo::getProcessName) + .leftJoin(ProdBaseProcessInfo.class, ProdBaseProcessInfo::getProcessId, ProdOutputScanInfo::getProcessId) + .eq(bo.getProdOutputScanInfoId() != null, ProdOutputScanInfo::getProdOutputScanInfoId, bo.getProdOutputScanInfoId()) .eq(bo.getProcessId() != null, ProdOutputScanInfo::getProcessId, bo.getProcessId()) .eq(bo.getMachineId() != null, ProdOutputScanInfo::getMachineId, bo.getMachineId())