Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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;
+}

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;
+    }
 }