From b06ecdd3f375cb22d85ada0c904bca2a34356774 Mon Sep 17 00:00:00 2001 From: zcg Date: Wed, 18 Dec 2019 14:27:16 +0800 Subject: [PATCH] =?UTF-8?q?[bug=EF=BC=9A7043=EF=BC=8CPCN=E8=8A=82=E7=82=B9?= =?UTF-8?q?-=E6=A8=A1=E5=9D=97=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java | 8 ++++++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java | 8 ++++++++ .../java/cn/estsh/i3plus/pojo/mes/model/MesPartObjectModel.java | 3 +++ 3 files changed, 19 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java index 818cbcb..247c8d9 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java @@ -39,10 +39,18 @@ public class MesPcn extends BaseBean { @ApiParam("区域") private String areaCode; + @Column(name = "AREA_NAME") + @ApiParam("区域名称") + private String areaName; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; + @Column(name = "WORK_CENTER_NAME") + @ApiParam("工作中心名称") + private String workCenterName; + @Column(name = "PCN_VERSION") @ApiParam("PCN版本") private String pcnVersion; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java index 33f1de2..c98a0dc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java @@ -39,10 +39,18 @@ public class MesPcn extends BaseBean { @ApiParam("区域") private String areaCode; + @Column(name = "AREA_NAME") + @ApiParam("区域") + private String areaName; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; + @Column(name = "WORK_CENTER_NAME") + @ApiParam("工作中心") + private String workCenterName; + @Column(name = "PCN_VERSION") @ApiParam("PCN版本") private String pcnVersion; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartObjectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartObjectModel.java index 0e1a398..b8ede8d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartObjectModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartObjectModel.java @@ -50,6 +50,9 @@ public class MesPartObjectModel { @ApiParam("对象名称") private String objectName; + public MesPartObjectModel() { + } + public MesPartObjectModel(Long id, String organizeCode, String createUser, String createDatetime, String modifyUser, String modifyDatetime, Integer isValid, Integer isDeleted, String partNo, String objectCode, String workCenterCode, String objectName) { this.id = id; this.organizeCode = organizeCode;