From 91fada5cc06895005e14a4eb80a030bbe2ba6631 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 11 Oct 2019 20:24:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=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/base/enumutil/WmsEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 9e9f331..318eba2 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -600,7 +600,8 @@ public class WmsEnumUtil { QC(220, "QC", "QC"), AMPR(230, "AMPR", "AMPR"), FINISHGOODS(240, "FINISHGOODS", "VDA生产快速入库"), - VDA_REPORT(250, "VDA_REPORT", "VDA生产报工"); + VDA_REPORT(250, "VDA_REPORT", "VDA生产报工"), + VDA_PR_INSTOCK(260, "VDA_PR_INSTOCK", "VDA生产推荐入库"); private int value; From 24a3b0e2b0e06cad65f2e185be396f0cd4fe0094 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 11 Oct 2019 20:32:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?mes=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesEquipment.java | 4 ++ .../i3plus/pojo/mes/model/MesEquipmentModel.java | 51 ++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java index f7f03b2..bdda980 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java @@ -79,6 +79,10 @@ public class MesEquipment extends BaseBean { @ApiParam("连接类型") private Integer connectType; + @Column(name="MEMO") + @ApiParam("备注") + private String memo; + @Transient @ApiParam(value ="名称") private String name; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java index cfe4f4d..2f34121 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java @@ -34,6 +34,37 @@ public class MesEquipmentModel implements Serializable { @ApiParam(value ="设备&工位") private String equipmentNameAndworkCellName; + @ApiParam("设备类型") + private Integer equipmentType; + + @ApiParam(value ="设备类别") + private String equipmentCategory; + + @ApiParam(value ="备注") + private String memo; + + @ApiParam(value ="设备型号") + private String equipmentModel; + + @ApiParam(value ="设备规格") + private String equipmentSpec; + + @ApiParam("制造商") + private String equipmentMaker; + + @ApiParam("出厂日期") + private String releaseDate; + + @ApiParam("接收日期") + private String receiveDate; + + @ApiParam("启用日期") + private String enableDate; + + @ApiParam("连接类型") + private Integer connectType; + + public MesEquipmentModel() { } @@ -60,4 +91,24 @@ public class MesEquipmentModel implements Serializable { this.workCellCode = workCellCode; } + + public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType) { + this.id = id; + this.equipmentCode = equipmentCode; + this.equipmentName = equipmentName; + this.status = status; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.areaCode = areaCode; + this.equipmentType = equipmentType; + this.equipmentCategory = equipmentCategory; + this.memo = memo; + this.equipmentModel = equipmentModel; + this.equipmentSpec = equipmentSpec; + this.equipmentMaker = equipmentMaker; + this.releaseDate = releaseDate; + this.receiveDate = receiveDate; + this.enableDate = enableDate; + this.connectType = connectType; + } } From 096c02d42d28db095e0d6e02ec8412068f862004 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 11 Oct 2019 20:36:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=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/bean/MesAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAction.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAction.java index a804e6e..8f2872f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAction.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAction.java @@ -26,7 +26,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name="MES_ACTION") -@Api("系统业务动作") +@Api("mes系统业务动作") public class MesAction extends BaseBean { @Column(name="ACTION_CODE") @ApiParam("动作代码")