From 8227353cbdc523775777da07b6ea3a09ccf984cf Mon Sep 17 00:00:00 2001 From: jiajack Date: Thu, 25 Apr 2019 09:56:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E7=A8=8B=E5=BA=8F=E7=BC=96?= =?UTF-8?q?=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java | 10 ++++++ .../pojo/mes/pcn/model/StationRequestBean.java | 6 ++++ .../pojo/mes/pcn/model/StationResultBean.java | 37 ++++++++++++++++++++++ 3 files changed, 53 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java index 1917e34..d9bd177 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description :工步 @@ -46,4 +47,13 @@ public class MesStep extends BaseBean { @Column(name = "STEP_OBJECT") @ApiParam("工步对象") private String stepObject; + + @Transient + @ApiParam("工步执行完毕") + private boolean isComplete; + + @Transient + @ApiParam("工步是否跳过") + private boolean isJump; + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java index f91da45..e214056 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java @@ -16,12 +16,18 @@ import java.io.Serializable; @Data public class StationRequestBean implements Serializable { + @ApiParam("扫描信息") + private String scanInfo; + @ApiParam("产品条码") private String serialNumber; @ApiParam("物料号") private String partNo; + @ApiParam("组织代码") + private String organizeCode; + @ApiParam("工作中心代码") private String workCenterCode; 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 new file mode 100644 index 0000000..66909dd --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java @@ -0,0 +1,37 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesStep; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : 工位结果bean + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-24 + * @Modify: + **/ +@Data +public class StationResultBean implements Serializable { + + /** + * 根据客户端所需数据结构,约定不同数据类型 + */ + @ApiParam("数据类型") + private String flagType; + + @ApiParam("是否错误信息") + private boolean fail; + + @ApiParam("执行结果信息") + private String message; + + @ApiParam("工步展示信息") + private String stepHtml; + + @ApiParam("工步清单") + private List stepList; +}