I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
yun-zuoyi
Silliter 6 years ago
parent c5093b073c 37efbf718e
commit 2b37ad77c5
3 changed files with 76 additions and 47 deletions
Show Stats Download Patch File Download Diff File

76
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
Unescape Escape View File

@ -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=JOB脚本，50=其他脚本
*/
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;

42
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java
Unescape Escape View File

@ -49,33 +49,33 @@ public class WmsActionGroup extends BaseBean {
@ApiParam(value = "初始化组件编号", example = "0")
private Long initAmId;
@Transient
@ApiParam(value = "初始化组件名称")
private String initAmName;
// @Transient
// @ApiParam(value = "初始化组件名称")
// private String initAmName;
@Column(name = "DETAILS_AM_ID")
@ApiParam(value = "明细处理组件编号", example = "0")
private Long detailsAmId;
@Transient
@ApiParam(value = "明细处理组件名称")
private String detailsAmName;
// @Transient
// @ApiParam(value = "明细处理组件名称")
// private String detailsAmName;
@Column(name = "SUBMIT_AM_ID")
@ApiParam(value = "提交组件编号", example = "0")
private Long submitAmId;
@Transient
@ApiParam(value = "提交组件名称")
private String submitAmName;
// @Transient
// @ApiParam(value = "提交组件名称")
// private String submitAmName;
@Column(name = "END_AM_ID")
@ApiParam(value = "结束组件编号", example = "0")
private Long endAmId;
@Transient
@ApiParam(value = "结束组件名称")
private String endAmName;
//
// @Transient
// @ApiParam(value = "结束组件名称")
// private String endAmName;
// 1=true, 2 = false
@Column(name = "AUTO_INIT")
@ -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;
}
}

5
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
Unescape Escape View File

@ -1139,7 +1139,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);
@ -1192,7 +1193,7 @@ public class WmsHqlPack {
DdlPreparedPack.getStringLikerPack(wmsActionModule.getAmName(), "amName", result);
DdlPreparedPack.getNumEqualPack(wmsActionModule.getId(), "id", result);
DdlPreparedPack.getNumEqualPack(wmsActionModule.getAmType(), "amType", result);
DdlPreparedPack.getNumEqualPack(wmsActionModule.getOpTypeCode(), "opTypeCode", result);
DdlPreparedPack.getStringEqualPack(wmsActionModule.getOpTypeCode(), "opTypeCode", result);
DdlPreparedPack.getNumEqualPack(wmsActionModule.getIsShowInfo(), "isShowInfo", result);
getStringBuilderPack(wmsActionModule, result);

Write Preview
Loading…
Cancel
Save