From 2e034eb6f2ead64d4de4ada11db3064868b7f49d Mon Sep 17 00:00:00 2001 From: geht <2947093423@qq.com> Date: Fri, 15 May 2026 18:08:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8E=9F=E6=9D=90=E6=96=99?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=A0=87=E5=87=86=E5=AE=9E=E4=BD=93=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E6=A3=80=E9=AA=8C=E6=A0=87=E5=87=86=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=8C=E4=BC=98=E5=8C=96=20MesRawMaterialI?= =?UTF-8?q?nspectStdPage=20=E4=BB=A5=E7=BB=A7=E6=89=BF=E8=AF=A5=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E3=80=82=E6=9B=B4=E6=96=B0=E7=9B=B8=E5=85=B3=E6=B3=A8?= =?UTF-8?q?=E9=87=8A=E4=BB=A5=E6=8F=90=E5=8D=87=E4=BB=A3=E7=A0=81=E5=8F=AF?= =?UTF-8?q?=E8=AF=BB=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/material/entity/MesRawMaterialInspectStd.java | 7 +++++++ .../mes/material/vo/MesRawMaterialInspectStdPage.java | 8 ++------ 2 files changed, 9 insertions(+), 6 deletions(-) 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 {}