diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdPlanInfoController.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdPlanInfoController.java
index 9abff05..a6fa6f5 100644
--- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdPlanInfoController.java
+++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdPlanInfoController.java
@@ -122,8 +122,8 @@ public class ProdPlanInfoController extends BaseController {
      * 下拉框查询生产工单信息列表
      */
 
-    @GetMapping("getProdPlanInfoList")
-    public R<List<ProdPlanInfoVo>> getProdPlanInfolist(ProdPlanInfoBo bo) {
+    @GetMapping("/getPlanInfoList")
+    public R<List<ProdPlanInfoVo>> getPlanInfoList(ProdPlanInfoBo bo) {
         List<ProdPlanInfoVo> list = prodPlanInfoService.queryList(bo);
         return R.ok(list);
     }
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 087e692..61dad57 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
@@ -173,14 +173,13 @@ public class ProdProductPlanDetail extends TenantEntity {
      * 工装名称
      */
     @TableField(exist = false)
-    private String toolingName;
+    private String toolingName;//JOIN
 
     @TableField(exist = false)
-    private String shiftName;
+    private String shiftName;//JOIN
 
     @TableField(exist = false)
-    private String classTeamName;
-
+    private String teamName;//JOIN
 
 
 
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 a922c6b..4c70b5d 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
@@ -1,14 +1,12 @@
 package org.dromara.mes.domain.vo;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.dromara.mes.domain.ProdProductPlanDetail;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.mes.domain.ProdProductPlanDetail;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -203,5 +201,13 @@ public class ProdProductPlanDetailVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 工装名称
+     */
+    private String toolingName;//JOIN
+
+    private String shiftName;//JOIN
+
+    private String teamName;//JOIN
 
 }
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 4558686..b46d005 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
@@ -97,10 +97,6 @@ public class ProdProductPlanDetailServiceImpl implements IProdProductPlanDetailS
             .select(BaseClassTeamInfo::getTeamName)
             .leftJoin(BaseClassTeamInfo.class, BaseClassTeamInfo::getClassTeamId, ProdProductPlanDetail::getClassTeamId)
 
-/*            //计划连表查询编号
-            .select(ProdPlanInfo::getPlanCode)//已存在plancode
-            .leftJoin(ProdPlanInfo.class, ProdPlanInfo::getPlanId, ProdProductPlanDetail::getPlanId)*/
-
 
             //接班
 /*            .select(ProdShiftChange::)