feat(eqp): 添加公辅消耗记录和公辅类型管理功能

- 创建公辅消耗记录实体类、业务对象和视图对象
- 实现公辅消耗记录的增删改查和导出功能
- 创建公辅类型实体类、业务对象和视图对象
- 实现公辅类型的增删改查和导出功能
- 添加对应的控制器、服务层和数据访问层实现
- 配置MyBatis映射文件和相关依赖
- 更新代码生成配置以适配新模块结构
This commit is contained in:
2026-04-29 16:13:21 +08:00
parent 7d4d2282fe
commit 788f5d2b7c
17 changed files with 879 additions and 1 deletions

View File

@@ -0,0 +1,52 @@
package com.klp.mes.eqp.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 公辅消耗记录对象 eqp_auxiliary_consume
*
* @author klp
* @date 2026-04-29
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("eqp_auxiliary_consume")
public class EqpAuxiliaryConsume extends BaseEntity {
private static final long serialVersionUID=1L;
/**
* 消耗记录ID
*/
@TableId(value = "consume_id")
private Long consumeId;
/**
* 记录日期
*/
private Date recordDate;
/**
* 公辅类型ID关联ems_auxiliary_type
*/
private Long typeId;
/**
* 消耗量
*/
private BigDecimal consume;
/**
* 删除标志0=存在 2=删除)
*/
@TableLogic
private String delFlag;
/**
* 备注
*/
private String remark;
}

View File

@@ -0,0 +1,45 @@
package com.klp.mes.eqp.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 公辅类型对象 eqp_auxiliary_type
*
* @author klp
* @date 2026-04-29
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("eqp_auxiliary_type")
public class EqpAuxiliaryType extends BaseEntity {
private static final long serialVersionUID=1L;
/**
* 公辅类型ID
*/
@TableId(value = "type_id")
private Long typeId;
/**
* 公辅类型名称
*/
private String typeName;
/**
* 产线名称
*/
private String lineName;
/**
* 删除标志0=存在 2=删除)
*/
@TableLogic
private String delFlag;
/**
* 备注
*/
private String remark;
}

View File

@@ -0,0 +1,49 @@
package com.klp.mes.eqp.domain.bo;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 公辅消耗记录业务对象 eqp_auxiliary_consume
*
* @author klp
* @date 2026-04-29
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class EqpAuxiliaryConsumeBo extends BaseEntity {
/**
* 消耗记录ID
*/
private Long consumeId;
/**
* 记录日期
*/
private Date recordDate;
/**
* 公辅类型ID关联ems_auxiliary_type
*/
private Long typeId;
/**
* 消耗量
*/
private BigDecimal consume;
/**
* 备注
*/
private String remark;
}

View File

@@ -0,0 +1,41 @@
package com.klp.mes.eqp.domain.bo;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
/**
* 公辅类型业务对象 eqp_auxiliary_type
*
* @author klp
* @date 2026-04-29
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class EqpAuxiliaryTypeBo extends BaseEntity {
/**
* 公辅类型ID
*/
private Long typeId;
/**
* 公辅类型名称
*/
private String typeName;
/**
* 产线名称
*/
private String lineName;
/**
* 备注
*/
private String remark;
}

View File

@@ -0,0 +1,57 @@
package com.klp.mes.eqp.domain.vo;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.klp.common.annotation.ExcelDictFormat;
import com.klp.common.convert.ExcelDictConvert;
import lombok.Data;
/**
* 公辅消耗记录视图对象 eqp_auxiliary_consume
*
* @author klp
* @date 2026-04-29
*/
@Data
@ExcelIgnoreUnannotated
public class EqpAuxiliaryConsumeVo {
private static final long serialVersionUID = 1L;
/**
* 消耗记录ID
*/
@ExcelProperty(value = "消耗记录ID")
private Long consumeId;
/**
* 记录日期
*/
@ExcelProperty(value = "记录日期")
private Date recordDate;
/**
* 公辅类型ID关联ems_auxiliary_type
*/
@ExcelProperty(value = "公辅类型ID", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "关=联ems_auxiliary_type")
private Long typeId;
/**
* 消耗量
*/
@ExcelProperty(value = "消耗量")
private BigDecimal consume;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}

View File

@@ -0,0 +1,47 @@
package com.klp.mes.eqp.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.klp.common.annotation.ExcelDictFormat;
import com.klp.common.convert.ExcelDictConvert;
import lombok.Data;
/**
* 公辅类型视图对象 eqp_auxiliary_type
*
* @author klp
* @date 2026-04-29
*/
@Data
@ExcelIgnoreUnannotated
public class EqpAuxiliaryTypeVo {
private static final long serialVersionUID = 1L;
/**
* 公辅类型ID
*/
@ExcelProperty(value = "公辅类型ID")
private Long typeId;
/**
* 公辅类型名称
*/
@ExcelProperty(value = "公辅类型名称")
private String typeName;
/**
* 产线名称
*/
@ExcelProperty(value = "产线名称")
private String lineName;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}