From c9a572469c9ce213e0e08564cfff6b48a39a8c98 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Thu, 10 Oct 2019 14:41:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=99=90=E5=88=B6=E8=A7=A3?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java | 8 ++++++++ .../cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java | 8 ++++++++ 3 files changed, 19 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java index f71bcdb..37acf86 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java @@ -34,6 +34,10 @@ public class MesProcessBom extends BaseBean { @ApiParam("零件号") private String partNo; + @Column(name = "PART_NAME") + @ApiParam("产品物料名称") + private String partName; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; @@ -54,6 +58,10 @@ public class MesProcessBom extends BaseBean { @ApiParam("子零件") private String itemPartNo; + @Column(name = "ITEM_PART_NAME") + @ApiParam("原材料物料名称") + private String itemPartName; + @Column(name = "QTY") @ColumnDefault("0") @ApiParam(value = "子零件数量", example = "0") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java index d54e52c..078e102 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java @@ -38,6 +38,9 @@ public class StationResultBean implements Serializable { @ApiParam("List结果集") private List resultList; + @ApiParam("结果对象") + private Object resultObj; + @ApiParam("Map结果集") public Map resultMap; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java index 41f30ea..646c69a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java @@ -36,6 +36,10 @@ public class MesProcessBom extends BaseBean { @ApiParam("零件号") private String partNo; + @Column(name = "PART_NAME") + @ApiParam("产品物料名称") + private String partName; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; @@ -57,6 +61,10 @@ public class MesProcessBom extends BaseBean { @ApiParam("子零件") private String itemPartNo; + @Column(name = "ITEM_PART_NAME") + @ApiParam("原材料物料名称") + private String itemPartName; + @Column(name = "QTY") @ColumnDefault("0") @ApiParam(value = "子零件数量", example = "0")