动态form + ptl_pcn亮灯修改

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java

@@ -20,7 +20,8 @@ public class BlockFormEnumUtil {
     public enum FORM_TABLE_TYPE {
         TABLE(1, "TABLE", "表"),
         VIEW(2, "VIEW", "视图"),
-        PROCEDURE(3, "PROCEDURE", "存储过程");
+        PROCEDURE(3, "PROCEDURE", "存储过程"),
+        CUSTOM(4, "CUSTOM", "自定义对象");
 
         private int value;
         private String code;
@@ -2799,4 +2800,6 @@ public class BlockFormEnumUtil {
         }
     }
 
+
+
 }

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java

@@ -75,6 +75,10 @@ public class BfDataObject extends BaseBean {
     @ApiParam(value ="描述")
     private String objectDescription;
 
+    @Column(name="DATA_OBJECT_TYPE")
+    @ApiParam(value ="对象类型")
+    private Integer dataObjectType;
+
     @Transient
     @ApiParam(value = "数据对象属性")
     @AnnoOutputColumn(hidden = true)

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java

@@ -66,6 +66,10 @@ public class PtlControl extends BaseBean implements Serializable {
     public transient Integer lockVersion;
 
     @Column(name = "BACKOFF")
-    @ApiParam("是否需要回调")
+    @ApiParam("是否需要回调--废弃,使用不同的策略")
     private Integer backoff;
+
+    @Column(name = "BACK_NAME")
+    @ApiParam("回调类--反射获取调用execute方法")
+    private String backName;
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/WhLightOnModel.java

@@ -0,0 +1,29 @@
+package cn.estsh.i3plus.pojo.ptl.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Castle
+ * @CreateDate : 2022/10/12 14:54
+ * @Modify:
+ **/
+@Data
+@ApiModel(value = "mes-pcn调用亮灯接口")
+public class WhLightOnModel {
+
+    @ApiModelProperty(value = "工厂")
+    private String organizeCode;
+
+    @ApiModelProperty(value = "总成物料号")
+    private String partNo;
+
+    @ApiModelProperty(value = "亮灯区域")
+    private String areaNo;
+
+    @ApiModelProperty(value = "操作员")
+    private String userName;
+}