From 2ef0dd5c3bd42d0a67e17d324160156712365dd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 27 Aug 2019 19:15:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=91=A8=E6=9C=9F=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=85=B3=E8=81=94=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java index 6b239f8..eac48cd 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java @@ -132,4 +132,11 @@ public class SysTaskPlan extends BaseBean { @Column(name = "NOTICE_CHANNEL") @ApiParam(value = "通知渠道") private String noticeChannel; + + public int getTaskPlanStatusVal() { + if(taskPlanStatus != null){ + return taskPlanStatus.intValue(); + } + return taskPlanStatus; + } } From f820c449bb13b536901d968e9cc2dc5eb8b564b2 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Tue, 27 Aug 2019 20:29:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B7=A5=E6=AD=A5=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../pojo/mes/pcn/model/StepPrintSnModel.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java new file mode 100644 index 0000000..bd0498c --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSn; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: 打印条码工步， 打印信息模板 + * @Reference: + * @Author: Crish + * @CreateDate:2019-08-27-13:24 + * @Modify: + **/ +@Data +@Api("过程条码打印信息模板") +public class StepPrintSnModel extends MesProduceSn { + @ApiParam("打印描述") + private String printDesc; +}