diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdInputScanInfo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdInputScanInfo.java index 9664ca6..ec4282c 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdInputScanInfo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/ProdInputScanInfo.java @@ -6,6 +6,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serial; +import java.util.Date; /** * 生产投入扫描信息对象 prod_input_scan_info @@ -77,6 +78,10 @@ public class ProdInputScanInfo extends TenantEntity { */ private String remark; + /** + * 投料时间 + */ + private Date feedingTime; /** * 物料名称 diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdInputScanInfoBo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdInputScanInfoBo.java index cff2792..219daf0 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdInputScanInfoBo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/bo/ProdInputScanInfoBo.java @@ -9,6 +9,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; +import java.util.Date; + /** * 生产投入扫描信息业务对象 prod_input_scan_info * @@ -75,5 +77,8 @@ public class ProdInputScanInfoBo extends BaseEntity { */ private String remark; - + /** + * 投料时间 + */ + private Date feedingTime; } diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdInputScanInfoVo.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdInputScanInfoVo.java index fd10d08..57e670b 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdInputScanInfoVo.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/domain/vo/ProdInputScanInfoVo.java @@ -2,6 +2,8 @@ package org.dromara.mes.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import org.dromara.common.excel.annotation.ExcelDictFormat; @@ -10,7 +12,7 @@ import org.dromara.mes.domain.ProdInputScanInfo; import java.io.Serial; import java.io.Serializable; - +import java.util.Date; /** @@ -95,11 +97,28 @@ public class ProdInputScanInfoVo implements Serializable { @ExcelProperty(value = "备注") private String remark; + /** + * 创建者 + */ + private Long createBy; + + /** + * 记录时间 + */ + @ExcelProperty(value = "记录时间") + private Date createTime; + + /** + * 投料时间 + */ + @ExcelProperty(value = "投料时间") + private Date feedingTime; + /** * 物料名称 */ @ExcelProperty(value = "物料名称") - private String materielName;//join映射字段 + private String materialName;//join映射字段 /** * 投料工位名称