From 0a14b533d7a08d6571b5f954bf9099268d44744b Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 18 Apr 2020 11:04:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A11659=20=E8=BF=94=E5=B7=A5?= =?UTF-8?q?=E8=BF=94=E4=BF=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/model/BypassModel.java | 32 ++++++++++++++++++++++ .../estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java | 9 ++++++ 2 files changed, 41 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java new file mode 100644 index 0000000..2e7cfef --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java @@ -0,0 +1,32 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @author wangjie + * @date 2020/4/9 18:00 + * @desc + */ +@Data +public class BypassModel { + + @ApiParam("生产线") + private String workCenterCode; + + @ApiParam("工位") + private String workCellCode; + + @ApiParam("Bypass编码") + private String bypassCode; + + @ApiParam("检测项") + private String businessValue; + + @ApiParam("是否确认，1=已确认，2=未确认") + private String isVerify; + + @ApiParam("生产数据ID") + private Long productDataId; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java index b043598..9672b1d 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -41,4 +42,12 @@ public class PtlAreaRoute extends BaseBean implements Serializable { @Column(name = "ROUTE_TYPE") @ApiParam("流程类型") private Integer routeType; + + @Transient + @ApiParam("区域代码") + private String areaName; + + @Transient + @ApiParam("流程名称") + private String routeName; }