change(mes): 产出扫描信息增加物料、机台、工装、工序名称

- 在 ProdOutputScanInfo 模型中添加物料、机台、工装、工序名称字段
- 更新前端表格显示，将 ID 列替换为对应的名称列
- 修改后端查询逻辑，加入连表查询以获取名称信息

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映射字段
+
+
 }

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映射字段
 
 }

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<String, Object> params = bo.getParams();
         MPJLambdaWrapper<ProdOutputScanInfo> 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())