From 942a5e1d696978b43906a691a923727ac9202b30 Mon Sep 17 00:00:00 2001 From: yinq Date: Mon, 21 Jul 2025 17:24:18 +0800 Subject: [PATCH] =?UTF-8?q?update=20mes=E5=B7=A5=E5=BA=8F=E5=B7=A5?= =?UTF-8?q?=E8=89=BA=E5=85=B3=E8=81=94=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/dromara/mes/domain/ProdTechnologyInfo.java | 6 ++++++ .../org/dromara/mes/domain/bo/ProdTechnologyInfoBo.java | 5 +++++ .../org/dromara/mes/domain/vo/ProdTechnologyInfoVo.java | 7 +++++-- .../mes/service/impl/ProdTechnologyInfoServiceImpl.java | 9 ++++----- 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdTechnologyInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdTechnologyInfo.java index d98173e..077b9c5 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdTechnologyInfo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdTechnologyInfo.java @@ -83,4 +83,10 @@ public class ProdTechnologyInfo extends TenantEntity { @TableField(exist = false) private String materialName; + + /** + * 设备类型名称 + */ + @TableField(exist = false) + private String deviceTypeName; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdTechnologyInfoBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdTechnologyInfoBo.java index ed6badf..63bc32b 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdTechnologyInfoBo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdTechnologyInfoBo.java @@ -75,6 +75,11 @@ public class ProdTechnologyInfoBo extends BaseEntity { */ private String remark; + /** + * 设备类型名称 + */ + private String deviceTypeName; + private List prodTechnologyStepInfoList; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdTechnologyInfoVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdTechnologyInfoVo.java index 4263fd9..9d91f6d 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdTechnologyInfoVo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdTechnologyInfoVo.java @@ -57,10 +57,13 @@ public class ProdTechnologyInfoVo implements Serializable { /** * 机台类型(1类一 2类二) */ - @ExcelProperty(value = "机台类型", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "mes_machine_type") private String machineType; + /** + * 设备类型名称 + */ + private String deviceTypeName; + /** * 工艺类型(1量产 2限产) */ diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdTechnologyInfoServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdTechnologyInfoServiceImpl.java index 03a9ee0..a5c8aa2 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdTechnologyInfoServiceImpl.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdTechnologyInfoServiceImpl.java @@ -11,16 +11,13 @@ 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.BaseMaterialInfo; -import org.dromara.mes.domain.ProdBaseProcessInfo; -import org.dromara.mes.domain.ProdTechnologyStepInfo; +import org.dromara.mes.domain.*; import org.dromara.mes.domain.bo.ProdTechnologyStepInfoBo; import org.dromara.mes.domain.vo.ProdTechnologyStepInfoVo; import org.dromara.mes.mapper.ProdTechnologyStepInfoMapper; import org.springframework.stereotype.Service; import org.dromara.mes.domain.bo.ProdTechnologyInfoBo; import org.dromara.mes.domain.vo.ProdTechnologyInfoVo; -import org.dromara.mes.domain.ProdTechnologyInfo; import org.dromara.mes.mapper.ProdTechnologyInfoMapper; import org.dromara.mes.service.IProdTechnologyInfoService; import org.springframework.transaction.annotation.Transactional; @@ -98,12 +95,14 @@ public class ProdTechnologyInfoServiceImpl implements IProdTechnologyInfoService .selectAll(ProdTechnologyInfo.class) .select(ProdBaseProcessInfo::getProcessName) .select(BaseMaterialInfo::getMaterialName) + .select(BaseDeviceType::getDeviceTypeName) .leftJoin(ProdBaseProcessInfo.class, ProdBaseProcessInfo::getProcessId, ProdTechnologyInfo::getProcessId) .leftJoin(BaseMaterialInfo.class, BaseMaterialInfo::getMaterialId, ProdTechnologyInfo::getMaterialId) + .leftJoin(BaseDeviceType.class, BaseDeviceType::getDeviceTypeId, ProdTechnologyInfo::getMachineType) .eq(bo.getTechnologyId() != null, ProdTechnologyInfo::getTechnologyId, bo.getTechnologyId()) .eq(bo.getProcessId() != null, ProdTechnologyInfo::getProcessId, bo.getProcessId()) .eq(bo.getMaterialId() != null, ProdTechnologyInfo::getMaterialId, bo.getMaterialId()) - .eq(StringUtils.isNotBlank(bo.getMachineType()), ProdTechnologyInfo::getMachineType, bo.getMachineType()) + .eq(StringUtils.isNotBlank(bo.getMachineType()), BaseDeviceType::getDeviceTypeId, bo.getMachineType()) .eq(StringUtils.isNotBlank(bo.getTechnologyType()), ProdTechnologyInfo::getTechnologyType, bo.getTechnologyType()) .eq(StringUtils.isNotBlank(bo.getTechnologyVersion()), ProdTechnologyInfo::getTechnologyVersion, bo.getTechnologyVersion()) .eq(bo.getStandardTime() != null, ProdTechnologyInfo::getStandardTime, bo.getStandardTime())