diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/entity/MesRawMaterialInspectStd.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/entity/MesRawMaterialInspectStd.java index 7d9cae2..15d0847 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/entity/MesRawMaterialInspectStd.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/entity/MesRawMaterialInspectStd.java @@ -1,12 +1,14 @@ package org.jeecg.modules.mes.material.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import java.io.Serializable; import java.util.Date; +import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -71,4 +73,9 @@ public class MesRawMaterialInspectStd implements Serializable { private Date updateTime; private Integer delFlag; + + /** 检验标准明细(子表 mes_raw_material_inspect_std_line,通过 stdId 关联本表 id;不参与主表入库映射) */ + @TableField(exist = false) + @Schema(description = "MES原材料检验标准-检验项明细列表") + private List lineList; } diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/vo/MesRawMaterialInspectStdPage.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/vo/MesRawMaterialInspectStdPage.java index b2cfbf5..34b753e 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/vo/MesRawMaterialInspectStdPage.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/vo/MesRawMaterialInspectStdPage.java @@ -1,14 +1,10 @@ package org.jeecg.modules.mes.material.vo; -import java.util.List; import lombok.Data; import lombok.EqualsAndHashCode; import org.jeecg.modules.mes.material.entity.MesRawMaterialInspectStd; -import org.jeecg.modules.mes.material.entity.MesRawMaterialInspectStdLine; +/** 主子保存/编辑页 VO,继承主表实体(含 {@link MesRawMaterialInspectStd#lineList} 明细)。 */ @Data @EqualsAndHashCode(callSuper = true) -public class MesRawMaterialInspectStdPage extends MesRawMaterialInspectStd { - - private List lineList; -} +public class MesRawMaterialInspectStdPage extends MesRawMaterialInspectStd {}