#4091+流程配置复制流程+作业步骤参数,作业组件,作业组件参数,作业流程基础数据接口代码调整

yun-zuoyi
许心洁 6 years ago
parent c03810358b
commit 4cf5fbc2b7

@ -139,17 +139,17 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MASTER_ORDER_STATUS {
CREATE(10, "CREATE","新建"),
RECEIPT(20, "RECEIPT","处理中"),
RECEIPT_FINISH(30, "RECEIPT_FINISH","已完成"),
CLOSED(40, "CLOSED","已关闭"),
CANCELLED(50, "CANCELLED","已取消");
CREATE(10, "CREATE", "新建"),
RECEIPT(20, "RECEIPT", "处理中"),
RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"),
CLOSED(40, "CLOSED", "已关闭"),
CANCELLED(50, "CANCELLED", "已取消");
private int value;
private String code;
private String description;
MASTER_ORDER_STATUS(int value,String code, String description) {
MASTER_ORDER_STATUS(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
@ -670,6 +670,40 @@ public class WmsEnumUtil {
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MODULE_METHOD_NAME {
EXECUTE("execute", "执行方法"),
GETOPTIONS("getOptions", "流程初始化方法"),
PROMPT("prompt", "初始化方法"),
GETLIST("getList", "获取列表数据"),
DOCOMPLETE("doComplete", "执行完成方法"),
SHOWINFORMATION("showInformation", "回显方法"),
INSTALL("install", "安装组件"),
UNINSTALL("unInstall", "卸载组件");
private String value;
private String description;
MODULE_METHOD_NAME(String value, String description) {
this.value = value;
this.description = description;
}
public String getCode() {
return value;
}
public String getDescription() {
return description;
}
public String getValue() {
return value;
}
}
/**
*
@ -1456,6 +1490,16 @@ public class WmsEnumUtil {
}
return tmp;
}
public static COMPONENT_TYPE switchGetValue(int val) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
}
/**
@ -2109,11 +2153,11 @@ public class WmsEnumUtil {
* 10=20=30=40=JOB50=
*/
public enum SCRIPT_TYPE {
MODUAL(10,"Modual","组件脚本"),
FORM(20,"Form","表单脚本"),
REPORT(30,"Report","报表脚本"),
JOB(40,"Job","JOB脚本"),
OTHER(50,"Other","其他脚本");
MODUAL(10, "Modual", "组件脚本"),
FORM(20, "Form", "表单脚本"),
REPORT(30, "Report", "报表脚本"),
JOB(40, "Job", "JOB脚本"),
OTHER(50, "Other", "其他脚本");
private String description;
private int value;
@ -2147,9 +2191,9 @@ public class WmsEnumUtil {
* 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby
*/
public enum LANGUAGE_TYPE {
GROOVY(1,"Groovy", 10),
PYTHON(2,"Python", 20),
JS(3,"JavaScript", 30);
GROOVY(1, "Groovy", 10),
PYTHON(2, "Python", 20),
JS(3, "JavaScript", 30);
// 下面这2种语言没人会写暂不支持
//SCALA(40,"scala"),
//JRUBY(50,"jruby");
@ -2194,9 +2238,9 @@ public class WmsEnumUtil {
* 2.BUSI
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WMS_CONFIG_TYPE{
public enum WMS_CONFIG_TYPE {
SYSTEM(10,"系统参数","系统参数"),
SYSTEM(10, "系统参数", "系统参数"),
BUSI(20, "业务参数", "业务参数");
private int value;

@ -108,20 +108,4 @@ public class WmsActionGroup extends BaseBean {
public WmsActionGroup() {
}
// public WmsActionGroup(String agNameE, String agDescE, String agNameC, String agDescC, Integer autoInit, Long initAmId, String initAmName, Long detailsAmId, String detailsAmName, Long submitAmId, String submitAmName, Long endAmId, String endAmName) {
// this.agNameE = agNameE;
// this.agDescE = agDescE;
// this.agNameC = agNameC;
// this.agDescC = agDescC;
// this.autoInit = autoInit;
// this.initAmId = initAmId;
// this.initAmName = initAmName;
// this.detailsAmId = detailsAmId;
// this.detailsAmName = detailsAmName;
// this.submitAmId = submitAmId;
// this.submitAmName = submitAmName;
// this.endAmId = endAmId;
// this.endAmName = endAmName;
// }
}

@ -1238,7 +1238,8 @@ public class WmsHqlPack {
DdlPackBean result = new DdlPackBean();
//查询参数封装
DdlPreparedPack.getStringEqualPack(wmsActionStepType.getAtNameC(), "atNameC", result);
DdlPreparedPack.getStringLikerPack(wmsActionStepType.getAtNameC(), "atNameC", result);
DdlPreparedPack.getStringLikerPack(wmsActionStepType.getFunCallName(), "funCallName", result);
getStringBuilderPack(wmsActionStepType, result);

Loading…
Cancel
Save