diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdProductPlanDetail.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdProductPlanDetail.java
index 4920d3b6..087e6923 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdProductPlanDetail.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdProductPlanDetail.java
@@ -56,12 +56,12 @@ public class ProdProductPlanDetail extends TenantEntity {
     /**
      * 班次ID
      */
-    private Long classesId;
+    private Long shiftId;
 
     /**
      * 班组ID
      */
-    private Long teamId;
+    private Long classTeamId;
 
     /**
      * 完成数量
@@ -169,5 +169,19 @@ public class ProdProductPlanDetail extends TenantEntity {
     @TableLogic
     private String delFlag;
 
+    /**
+     * 工装名称
+     */
+    @TableField(exist = false)
+    private String toolingName;
+
+    @TableField(exist = false)
+    private String shiftName;
+
+    @TableField(exist = false)
+    private String classTeamName;
+
+
+
 
 }
diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdProductPlanDetailBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdProductPlanDetailBo.java
index cb8322c8..6797b873 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdProductPlanDetailBo.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdProductPlanDetailBo.java
@@ -60,13 +60,13 @@ public class ProdProductPlanDetailBo extends BaseEntity {
      * 班次ID
      */
     @NotNull(message = "班次ID不能为空", groups = {AddGroup.class, EditGroup.class})
-    private Long classesId;
+    private Long shiftId;
 
     /**
      * 班组ID
      */
     @NotNull(message = "班组ID不能为空", groups = {AddGroup.class, EditGroup.class})
-    private Long teamId;
+    private Long classTeamId;
 
     /**
      * 完成数量
diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdProductPlanDetailVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdProductPlanDetailVo.java
index 124cf5fe..a922c6ba 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdProductPlanDetailVo.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdProductPlanDetailVo.java
@@ -70,13 +70,13 @@ public class ProdProductPlanDetailVo implements Serializable {
      * 班次ID
      */
     @ExcelProperty(value = "班次ID")
-    private Long classesId;
+    private Long shiftId;
 
     /**
      * 班组ID
      */
     @ExcelProperty(value = "班组ID")
-    private Long teamId;
+    private Long classTeamId;
 
     /**
      * 完成数量
diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdProductPlanDetailServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdProductPlanDetailServiceImpl.java
index 6600d77f..45586864 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdProductPlanDetailServiceImpl.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdProductPlanDetailServiceImpl.java
@@ -1,28 +1,25 @@
 package org.dromara.mes.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.toolkit.JoinWrappers;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import lombok.RequiredArgsConstructor;
 import org.dromara.common.constant.DatabaseConstants;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mapper.DynamicBaseSqlMapper;
-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.dromara.mes.domain.ProdPlanInfo;
-import org.dromara.mes.domain.vo.ProdPlanInfoVo;
-import org.springframework.stereotype.Service;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.mes.domain.*;
 import org.dromara.mes.domain.bo.ProdProductPlanDetailBo;
 import org.dromara.mes.domain.vo.ProdProductPlanDetailVo;
-import org.dromara.mes.domain.ProdProductPlanDetail;
 import org.dromara.mes.mapper.ProdProductPlanDetailMapper;
 import org.dromara.mes.service.IProdProductPlanDetailService;
+import org.springframework.stereotype.Service;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Collection;
 
 /**
  * 生产信息Service业务层处理
@@ -87,14 +84,37 @@ public class ProdProductPlanDetailServiceImpl implements IProdProductPlanDetailS
         Map<String, Object> params = bo.getParams();
         MPJLambdaWrapper<ProdProductPlanDetail> lqw = JoinWrappers.lambda(ProdProductPlanDetail.class)
             .selectAll(ProdProductPlanDetail.class)
+
+            //工装连表查询名称
+            .select(BaseToolingInfo::getToolingName)
+            .leftJoin(BaseToolingInfo.class, BaseToolingInfo::getToolingId, ProdProductPlanDetail::getToolingId)
+
+            //班次连表查询名称
+            .select(BaseShiftInfo::getShiftName)
+            .leftJoin(BaseShiftInfo.class, BaseShiftInfo::getShiftId, ProdProductPlanDetail::getShiftId)
+
+            //班组连表查询名称
+            .select(BaseClassTeamInfo::getTeamName)
+            .leftJoin(BaseClassTeamInfo.class, BaseClassTeamInfo::getClassTeamId, ProdProductPlanDetail::getClassTeamId)
+
+/*            //计划连表查询编号
+            .select(ProdPlanInfo::getPlanCode)//已存在plancode
+            .leftJoin(ProdPlanInfo.class, ProdPlanInfo::getPlanId, ProdProductPlanDetail::getPlanId)*/
+
+
+            //接班
+/*            .select(ProdShiftChange::)
+            .leftJoin(ProdShiftChange.class, ProdShiftChange::getShiftChangeId, ProdProductPlanDetail::getShiftChangeId)*/
+
+
             .eq(bo.getPlanDetailId() != null, ProdProductPlanDetail::getPlanDetailId, bo.getPlanDetailId())
             .eq(StringUtils.isNotBlank(bo.getPlanDetailCode()), ProdProductPlanDetail::getPlanDetailCode, bo.getPlanDetailCode())
             .eq(bo.getPlanId() != null, ProdProductPlanDetail::getPlanId, bo.getPlanId())
             .eq(StringUtils.isNotBlank(bo.getPlanCode()), ProdProductPlanDetail::getPlanCode, bo.getPlanCode())
             .eq(StringUtils.isNotBlank(bo.getUserId()), ProdProductPlanDetail::getUserId, bo.getUserId())
             .like(StringUtils.isNotBlank(bo.getUserName()), ProdProductPlanDetail::getUserName, bo.getUserName())
-            .eq(bo.getClassesId() != null, ProdProductPlanDetail::getClassesId, bo.getClassesId())
-            .eq(bo.getTeamId() != null, ProdProductPlanDetail::getTeamId, bo.getTeamId())
+            .eq(bo.getShiftId() != null, ProdProductPlanDetail::getShiftId, bo.getShiftId())
+            .eq(bo.getClassTeamId() != null, ProdProductPlanDetail::getClassTeamId, bo.getClassTeamId())
             .eq(bo.getCompleteAmount() != null, ProdProductPlanDetail::getCompleteAmount, bo.getCompleteAmount())
             .eq(bo.getUnitId() != null, ProdProductPlanDetail::getUnitId, bo.getUnitId())
             .like(StringUtils.isNotBlank(bo.getUnitName()), ProdProductPlanDetail::getUnitName, bo.getUnitName())