update mes工序工艺关联设备类型

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;
 }

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<ProdTechnologyStepInfo> prodTechnologyStepInfoList;
 
 }

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限产）
      */

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.*;
-import org.dromara.mes.domain.ProdBaseProcessInfo;
-import org.dromara.mes.domain.ProdTechnologyStepInfo;
 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())