refactor(mes): 修改生产信息

- 修改 ProdPlanInfoController 中的接口路径
- 更新 ProdProductPlanDetail 模型中的字段注释
- 移除 ProdProductPlanDetailServiceImpl 中的冗余代码
- 更新 ProdProductPlanDetailVo 中的字段结构
master
zch 4 months ago
parent 89613641a3
commit 494177e5f0

@ -122,8 +122,8 @@ public class ProdPlanInfoController extends BaseController {
* *
*/ */
@GetMapping("getProdPlanInfoList") @GetMapping("/getPlanInfoList")
public R<List<ProdPlanInfoVo>> getProdPlanInfolist(ProdPlanInfoBo bo) { public R<List<ProdPlanInfoVo>> getPlanInfoList(ProdPlanInfoBo bo) {
List<ProdPlanInfoVo> list = prodPlanInfoService.queryList(bo); List<ProdPlanInfoVo> list = prodPlanInfoService.queryList(bo);
return R.ok(list); return R.ok(list);
} }

@ -173,14 +173,13 @@ public class ProdProductPlanDetail extends TenantEntity {
* *
*/ */
@TableField(exist = false) @TableField(exist = false)
private String toolingName; private String toolingName;//JOIN
@TableField(exist = false) @TableField(exist = false)
private String shiftName; private String shiftName;//JOIN
@TableField(exist = false) @TableField(exist = false)
private String classTeamName; private String teamName;//JOIN

@ -1,14 +1,12 @@
package org.dromara.mes.domain.vo; 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.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; 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 io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; 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.Serial;
import java.io.Serializable; import java.io.Serializable;
@ -203,5 +201,13 @@ public class ProdProductPlanDetailVo implements Serializable {
@ExcelProperty(value = "备注") @ExcelProperty(value = "备注")
private String remark; private String remark;
/**
*
*/
private String toolingName;//JOIN
private String shiftName;//JOIN
private String teamName;//JOIN
} }

@ -97,10 +97,6 @@ public class ProdProductPlanDetailServiceImpl implements IProdProductPlanDetailS
.select(BaseClassTeamInfo::getTeamName) .select(BaseClassTeamInfo::getTeamName)
.leftJoin(BaseClassTeamInfo.class, BaseClassTeamInfo::getClassTeamId, ProdProductPlanDetail::getClassTeamId) .leftJoin(BaseClassTeamInfo.class, BaseClassTeamInfo::getClassTeamId, ProdProductPlanDetail::getClassTeamId)
/* //计划连表查询编号
.select(ProdPlanInfo::getPlanCode)//已存在plancode
.leftJoin(ProdPlanInfo.class, ProdPlanInfo::getPlanId, ProdProductPlanDetail::getPlanId)*/
//接班 //接班
/* .select(ProdShiftChange::) /* .select(ProdShiftChange::)

Loading…
Cancel
Save