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 25c2560..72f81e1 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 @@ -2129,7 +2129,9 @@ public class WmsEnumUtil { NUMBER(10, "数字"), STRING(20, "字符串"), CONFIGURABLE_STR(25, "可配字符串"), - OUT_OR_UNNECESSARY(30, "出参或者不必需的参数"); + OUT_OR_UNNECESSARY(30, "出参或者不必需的参数"), + COMPONET(40,"组件"), + SCRIPT(50,"脚本"); private int value; private String description; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgImportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgImportModel.java index 4d3f2fd..3b1b678 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgImportModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsAgImportModel.java @@ -35,6 +35,8 @@ public class WmsAgImportModel implements Serializable { List ampList; @ApiParam("作业步骤参数类型集合") List astList; + @ApiParam("作业脚本参数集合") + List scriptList; @ApiParam("工厂代码") public String organizeCode; @ApiParam("是否覆盖") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistence.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistence.java index da7d4e1..efcf812 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistence.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/EngineScriptPersistence.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import lombok.Data; @@ -33,28 +34,34 @@ public class EngineScriptPersistence extends BaseBean { private static final long serialVersionUID = 7893111140559759490L; // 脚本调用的唯一编号,例如:WMS_PDA_0001 @Column(name = "SCRIPT_NO", length = 50) + @AnnoOutputColumn(name = "脚本编码") private String scriptNo; // 脚本的中文名称 @Column(name = "SCRIPT_NAME", length = 50) + @AnnoOutputColumn(name = "脚本名称") private String scriptName; // 10=组件脚本,20=表单脚本,30=报表脚本,40=JOB脚本,50=其他脚本 @Column(name = "SCRIPT_TYPE") + @AnnoOutputColumn(name = "脚本类型") private Integer scriptType; // 脚本编写的语言 // 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby @Column(name = "LANGUAGE_TYPE") + @AnnoOutputColumn(name = "脚本语言") private Integer languageType; // 脚本的具体内容 @Lob @Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT") + @AnnoOutputColumn(name = "脚本内容") private String scriptContent; // 脚本的描述,包含脚本的用法,参数说明等 @Column(name = "SCRIPT_REMARK", length = 2000) + @AnnoOutputColumn(name = "脚本描述") private String scriptRemark; // 编译后的脚本内容,通过预编译加快脚本的运行速度