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
lbwgithub 6 years ago
parent 3e8bcbeb84 5c68a15d0c
commit c67fe92297
18 changed files with 455 additions and 393 deletions
Show Stats Download Patch File Download Diff File

13
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/RippleAnnotation.java
Unescape Escape View File

@ -0,0 +1,13 @@
package cn.estsh.i3plus.pojo.aps.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)
public @interface RippleAnnotation {
String[] dependence() default {};
String method() default "";
}

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java
Unescape Escape View File

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.RippleAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BaseCode;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.enums.MATERIAL_TYPE;
@ -66,6 +67,7 @@ public class Material extends BaseCode {
@Column(name="LEVEL")
@ApiParam(value ="低阶码")
@RippleAnnotation(dependence = {"OperOutputs.Operation.ProductRouting.Material"}, method = "calcLevel")
private Integer level;
@Column(name="IS_AUTO_FIX_PEGGING")

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java
Unescape Escape View File

@ -24,7 +24,7 @@ import java.util.List;
**/
@Data
@Entity
@Table(name = "APS_PRODUCTROUTING")
@Table(name = "APS_PRODUCT_ROUTING")
@Api("物料")
public class ProductRouting extends BaseCode {
@Column(name="VALID_START")

8
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java
Unescape Escape View File

@ -155,13 +155,13 @@ public class Work extends BaseCode {
}
@JsonBackReference
public List<WorkRelation> getWorkRelationInputs() {
return BeanRelation.list(this, EWork.WorkRelationInputs);
public List<WorkRelation> getPrevRelations() {
return BeanRelation.list(this, EWork.PrevRelations);
}
@JsonBackReference
public List<WorkRelation> getWorkRelationOutputs() {
return BeanRelation.list(this, EWork.WorkRelationOutputs);
public List<WorkRelation> getPostRelations() {
return BeanRelation.list(this, EWork.PostRelations);
}
@JsonBackReference

15
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java
Unescape Escape View File

@ -117,6 +117,17 @@ public class BeanRelation {
return result;
}
public static <T extends BaseBean> List<T> listByClass(BaseBean bean, Class<T> cls, Enum<?> holder, Enum<?>... args) {
List<T> beans = new ArrayList<>();
List<BaseBean> nextBeans = list(bean, holder, args);
for (BaseBean nextBean : nextBeans) {
if (nextBean.getClass() == cls) {
beans.add((T)nextBean);
}
}
return beans;
}
private static <T extends BaseBean> void listImpl(List<T> result, BaseBean bean, Predicate<T> pred, Enum<?>[] holders, int index) {
if (index >= holders.length) {
if (pred == null || pred.test((T)bean)) {
@ -191,7 +202,7 @@ public class BeanRelation {
* @param holder
*/
private static void remove(BaseBean bean, Enum<?> holder) {
if (holder == null) {
if (bean == null || holder == null) {
return;
}
BeanInfo beanInfo = BeanInfo.getBeanInfo(bean.getClass());
@ -215,7 +226,7 @@ public class BeanRelation {
* @param relaBean
*/
private static void remove(BaseBean bean, Enum<?> holder, BaseBean relaBean) {
if (bean == null) {
if (bean == null || holder == null) {
return;
}
BeanInfo beanInfo = BeanInfo.getBeanInfo(bean.getClass());

4
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java
Unescape Escape View File

@ -6,8 +6,8 @@ public enum EWork {
WorkResources,
WorkInputs,
WorkOutputs,
WorkRelationInputs,
WorkRelationOutputs,
PrevRelations,
PostRelations,
Operation,
PlanFeedbacks
}

4
modules/i3plus-pojo-aps/src/main/resources/relations/BaseOrder.xml
Unescape Escape View File

@ -4,8 +4,8 @@
</Relation>
<Relation field="Works" name="Work" reverse="Order" type="ONE_TO_MULTI" owner="true">
</Relation>
<Relation field="PrevRelations" name="WorkRelation" reverse="PrevOrder" type="ONE_TO_MULTI" owner="false">
<Relation field="PostRelations" name="WorkRelation" reverse="PrevOrder" type="ONE_TO_MULTI" owner="false">
</Relation>
<Relation field="PostRelations" name="WorkRelation" reverse="PostOrder" type="ONE_TO_MULTI" owner="false">
<Relation field="PrevRelations" name="WorkRelation" reverse="PostOrder" type="ONE_TO_MULTI" owner="false">
</Relation>
</Class>

2
modules/i3plus-pojo-aps/src/main/resources/relations/OperResource.xml
Unescape Escape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<Class name="OperResource">
<Relation field="Resource" name="Resource" reverse="OperResources" type="MULTI_TO_ONE" owner="false">
<Relation field="Resource" name="Resource" type="MULTI_TO_ONE" owner="false">
</Relation>
</Class>

2
modules/i3plus-pojo-aps/src/main/resources/relations/Operation.xml
Unescape Escape View File

@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Class name="Operation">
<Relation field="StandOperation" name="StandOperation" type="MULTI_TO_ONE" owner="false">
</Relation>
<Relation field="OperInputs" name="OperInput" reverse="Operation" type="ONE_TO_MULTI" owner="true">
</Relation>
<Relation field="OperOutputs" name="OperOutput" reverse="Operation" type="ONE_TO_MULTI" owner="true">

2
modules/i3plus-pojo-aps/src/main/resources/relations/StandOperation.xml
Unescape Escape View File

@ -1,5 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<Class name="StandOperation">
<Relation field="Operations" name="Operation" reverse="StandOperation" type="ONE_TO_MULTI" owner="false">
</Relation>
</Class>

4
modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml
Unescape Escape View File

@ -6,9 +6,9 @@
</Relation>
<Relation field="WORK_RESOURCES" name="WorkResource" reverse="Work" type="ONE_TO_MULTI" owner="true">
</Relation>
<Relation field="WorkRelationOutputs" name="WorkRelation" reverse="PrevWork" type="ONE_TO_MULTI" owner="false">
<Relation field="PostRelations" name="WorkRelation" reverse="PrevWork" type="ONE_TO_MULTI" owner="false">
</Relation>
<Relation field="WorkRelationInputs" name="WorkRelation" reverse="PostWork" type="ONE_TO_MULTI" owner="false">
<Relation field="PrevRelations" name="WorkRelation" reverse="PostWork" type="ONE_TO_MULTI" owner="false">
</Relation>
<Relation field="Operation" name="Operation" type="MULTI_TO_ONE" owner="false">
</Relation>

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

@ -823,114 +823,6 @@ public class BlockFormEnumUtil {
}
}
/**
* 元素控件类型信息
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PROPERTY_CONTROL_TYPE {
RADIO(100, "RADIO", "单选"),
CHECKBOX(110, "CHECKBOX", "复选"),
TEXT(200, "TEXT", "文本"),
NUMBER(210, "NUMBER", "数字"),
PASSWORD(230, "PASSWORD", "密码"),
DATE_TIME(300, "DATE", "日期",SQL_WHERE.BETWEEN),
// DATE(300, "DATE", "日期(yyyy-MM-dd)"),
// DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"),
// ELEMENT(700, "DICT_SELECT", "元素"),
DICTIONARY(800, "DICT_SELECT", "字典"),
CASCADE(900, "CASCADE", "级联");
//FILE(400, "file", "文件"),
//IMAGE(410, "image", "image"),
//OFF(500, "color", "颜色"),
private int value;
private String code;
private String description;
/**
* 默认查询关系
*/
private SQL_WHERE defaultWhere;
PROPERTY_CONTROL_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
PROPERTY_CONTROL_TYPE(int value, String code, String description, SQL_WHERE defaultWhere) {
this.value = value;
this.code = code;
this.description = description;
this.defaultWhere = defaultWhere;
}
public int getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
public SQL_WHERE getDefaultWhere() {
return defaultWhere;
}
public static String valueOfCode(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].code;
}
}
return tmp;
}
public static int codeOfValue(String code) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static PROPERTY_CONTROL_TYPE valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
public static String codeOfDescription(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* 属性字段排序规则
@ -1172,102 +1064,26 @@ public class BlockFormEnumUtil {
}
}
/**
* 属性类型信息(属性转换器)
* <per>
* <br/> Form 核心转换器
* <br/> 数据库字段类型转换Java 属性类型
* <br/> Java 属性 转换为控件类型
* </per>
* 执行类型信息
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PROPERTY_TYPE {
STRING(10, "String", "字符串", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.LIKE,""),
CHAR(11, "Character", "单字符", "java.lang.Character", Character.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,""),
INTEGER(20, "Integer", "短整型", "java.lang.Integer", Integer.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0"),
LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0"),
DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"),
FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"),
BIG_DECIMAL(32, "Double", "大浮点型", "java.math.BigDecimal", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"),
BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,SQL_WHERE.EQUAL,null),
BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null),
DATE_TIME(12, "String", "日期时分秒", "java.sql.Timestamp", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME,SQL_WHERE.BETWEEN,null,"yyyy-MM-dd hh:mm:ss");
public enum EXECUTION_TYPE {
SQL(10, "SQL", "SQL脚本"),
CLASS_METHOD(20, "ClassMethod", "类方法"),
SYSTEM_JAVA(30, "SystemClassMethod", "系统类方法"),
SCRIPT(40, "Script", "脚本");
/**
* 属性类型值
*/
private int value;
/**
* 属性类型代码
*/
private String code;
/**
* 属性类型描述
*/
private String description;
/**
* 属性类型ClassPath
*/
private String classPath;
/**
* 属性类型 Class
*/
private Class clzFullName;
/**
* 属性类型 对应的 控件类型
*/
private PROPERTY_CONTROL_TYPE controlType;
/**
* 默认查询关系
*/
private SQL_WHERE defaultWhere;
/**
* 默认 格式化 方式
*/
private String defaultFormat;
/**
* 默认查询关系
*/
private String defaultValue;
private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,
PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere) {
this.value = value;
this.code = code;
this.description = description;
this.classPath = classPath;
this.clzFullName = clzFullName;
this.controlType = controlType;
this.defaultWhere = defaultWhere;
}
private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,
PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue) {
this.value = value;
this.code = code;
this.description = description;
this.classPath = classPath;
this.clzFullName = clzFullName;
this.controlType = controlType;
this.defaultWhere = defaultWhere;
this.defaultValue = defaultValue;
this.defaultFormat = defaultFormat;
}
private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,
PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue,String defaultFormat) {
private EXECUTION_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
this.classPath = classPath;
this.clzFullName = clzFullName;
this.controlType = controlType;
this.defaultWhere = defaultWhere;
this.defaultValue = defaultValue;
this.defaultFormat = defaultFormat;
}
public int getValue() {
@ -1282,30 +1098,6 @@ public class BlockFormEnumUtil {
return description;
}
public String getClassPath() {
return classPath;
}
public Class getClzFullName() {
return clzFullName;
}
public PROPERTY_CONTROL_TYPE getControlType() {
return controlType;
}
public SQL_WHERE getDefaultWhere() {
return defaultWhere;
}
public String getDefaultFormat() {
return defaultFormat;
}
public String getDefaultValue() {
return defaultValue;
}
public static String valueOfCode(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -1316,182 +1108,38 @@ public class BlockFormEnumUtil {
return tmp;
}
public static PROPERTY_TYPE valueOfClzFullName(int val) {
PROPERTY_TYPE tmp = null;
public static int codeOfValue(String code) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i];
if (values()[i].code.equals(code)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static PROPERTY_CONTROL_TYPE valueOfControlType(int val) {
PROPERTY_CONTROL_TYPE tmp = null;
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].controlType;
tmp = values()[i].description;
}
}
return tmp;
}
public static int codeOfValue(String code) {
int tmp = 1;
public static EXECUTION_TYPE valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].value;
if (values()[i].value == val) {
return values()[i];
}
}
return tmp;
return null;
}
public static int codeOfClzFullName(Class clzFullName) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].clzFullName.equals(clzFullName)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static int codeOfClassPath(String classPath) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].classPath.equals(classPath)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static PROPERTY_TYPE valueOfClassPath(String classPath) {
PROPERTY_TYPE tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].classPath.equals(classPath)) {
tmp = values()[i];
}
}
return tmp;
}
public static PROPERTY_TYPE valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
public static PROPERTY_TYPE indexOf(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (val.indexOf(values()[i].value) >= 0) {
return values()[i];
}
}
return null;
}
public static String codeOfDescription(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* 执行类型信息
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum EXECUTION_TYPE {
SQL(10, "SQL", "SQL脚本"),
CLASS_METHOD(20, "ClassMethod", "类方法"),
SYSTEM_JAVA(30, "SystemClassMethod", "系统类方法"),
SCRIPT(40, "Script", "脚本");
private int value;
private String code;
private String description;
private EXECUTION_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
public static String valueOfCode(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].code;
}
}
return tmp;
}
public static int codeOfValue(String code) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static EXECUTION_TYPE valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
public static String codeOfDescription(String code) {
String tmp = null;
public static String codeOfDescription(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].description;
@ -2423,6 +2071,115 @@ public class BlockFormEnumUtil {
}
/**
* 元素控件类型信息
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PROPERTY_CONTROL_TYPE {
RADIO(100, "RADIO", "单选"),
CHECKBOX(110, "CHECKBOX", "复选"),
TEXT(200, "TEXT", "文本"),
NUMBER(210, "NUMBER", "数字"),
PASSWORD(230, "PASSWORD", "密码"),
DATE_TIME(300, "DATE", "日期",SQL_WHERE.BETWEEN),
// DATE(300, "DATE", "日期(yyyy-MM-dd)"),
// DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"),
// ELEMENT(700, "DICT_SELECT", "元素"),
DICTIONARY(800, "DICT_SELECT", "字典"),
CASCADE(900, "CASCADE", "级联");
//FILE(400, "file", "文件"),
//IMAGE(410, "image", "image"),
//OFF(500, "color", "颜色"),
private int value;
private String code;
private String description;
/**
* 默认查询关系
*/
private SQL_WHERE defaultWhere;
PROPERTY_CONTROL_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
PROPERTY_CONTROL_TYPE(int value, String code, String description, SQL_WHERE defaultWhere) {
this.value = value;
this.code = code;
this.description = description;
this.defaultWhere = defaultWhere;
}
public int getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
public SQL_WHERE getDefaultWhere() {
return defaultWhere;
}
public static String valueOfCode(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].code;
}
}
return tmp;
}
public static int codeOfValue(String code) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static PROPERTY_CONTROL_TYPE valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
public static String codeOfDescription(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* 条件运算符
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -2510,4 +2267,250 @@ public class BlockFormEnumUtil {
return tmp;
}
}
/**
* 属性类型信息(属性转换器)
* <per>
* <br/> Form 核心转换器
* <br/> 数据库字段类型转换Java 属性类型
* <br/> Java 属性 转换为控件类型
* </per>
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PROPERTY_TYPE {
STRING(10, "String", "字符串", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.LIKE,""),
CHAR(11, "Character", "单字符", "java.lang.Character", Character.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,""),
INTEGER(20, "Integer", "短整型", "java.lang.Integer", Integer.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0"),
LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0"),
DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"),
FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"),
BIG_DECIMAL(32, "Double", "大浮点型", "java.math.BigDecimal", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"),
BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,SQL_WHERE.EQUAL,null),
BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null),
DATE_TIME(12, "String", "日期时分秒", "java.sql.Timestamp", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME,SQL_WHERE.BETWEEN,null,"yyyy-MM-dd hh:mm:ss");
/**
* 属性类型值
*/
private int value;
/**
* 属性类型代码
*/
private String code;
/**
* 属性类型描述
*/
private String description;
/**
* 属性类型ClassPath
*/
private String classPath;
/**
* 属性类型 Class
*/
private Class clzFullName;
/**
* 属性类型 对应的 控件类型
*/
private PROPERTY_CONTROL_TYPE controlType;
/**
* 默认查询关系
*/
private SQL_WHERE defaultWhere;
/**
* 默认 格式化 方式
*/
private String defaultFormat;
/**
* 默认查询关系
*/
private String defaultValue;
private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,
PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere) {
this.value = value;
this.code = code;
this.description = description;
this.classPath = classPath;
this.clzFullName = clzFullName;
this.controlType = controlType;
this.defaultWhere = defaultWhere;
}
private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,
PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue) {
this.value = value;
this.code = code;
this.description = description;
this.classPath = classPath;
this.clzFullName = clzFullName;
this.controlType = controlType;
this.defaultWhere = defaultWhere;
this.defaultValue = defaultValue;
this.defaultFormat = defaultFormat;
}
private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,
PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue,String defaultFormat) {
this.value = value;
this.code = code;
this.description = description;
this.classPath = classPath;
this.clzFullName = clzFullName;
this.controlType = controlType;
this.defaultWhere = defaultWhere;
this.defaultValue = defaultValue;
this.defaultFormat = defaultFormat;
}
public int getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
public String getClassPath() {
return classPath;
}
public Class getClzFullName() {
return clzFullName;
}
public PROPERTY_CONTROL_TYPE getControlType() {
return controlType;
}
public SQL_WHERE getDefaultWhere() {
return defaultWhere;
}
public String getDefaultFormat() {
return defaultFormat;
}
public String getDefaultValue() {
return defaultValue;
}
public static String valueOfCode(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].code;
}
}
return tmp;
}
public static PROPERTY_TYPE valueOfClzFullName(int val) {
PROPERTY_TYPE tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i];
}
}
return tmp;
}
public static PROPERTY_CONTROL_TYPE valueOfControlType(int val) {
PROPERTY_CONTROL_TYPE tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].controlType;
}
}
return tmp;
}
public static int codeOfValue(String code) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static int codeOfClzFullName(Class clzFullName) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].clzFullName.equals(clzFullName)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static int codeOfClassPath(String classPath) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].classPath.equals(classPath)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static PROPERTY_TYPE valueOfClassPath(String classPath) {
PROPERTY_TYPE tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].classPath.equals(classPath)) {
tmp = values()[i];
}
}
return tmp;
}
public static PROPERTY_TYPE valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
public static PROPERTY_TYPE indexOf(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (val.indexOf(values()[i].value) >= 0) {
return values()[i];
}
}
return null;
}
public static String codeOfDescription(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

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

@ -521,6 +521,15 @@ public class BlockSoftSwitchEnumUtil {
}
return result;
}
public static PARAM_VALUE_TYPE valueOf(int value){
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
return null;
}
}
/**

1
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java
Unescape Escape View File

@ -75,6 +75,7 @@ public class MesEquipment extends BaseBean {
@ApiParam("启用日期")
private String enableDate;
@Column(name="CONNECT_TYPE")
@ApiParam("连接类型")
private Integer connectType;

8
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java
Unescape Escape View File

@ -34,6 +34,10 @@ public class MesProcessBom extends BaseBean {
@ApiParam("零件号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("产品物料名称")
private String partName;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@ -54,6 +58,10 @@ public class MesProcessBom extends BaseBean {
@ApiParam("子零件")
private String itemPartNo;
@Column(name = "ITEM_PART_NAME")
@ApiParam("原材料物料名称")
private String itemPartName;
@Column(name = "QTY")
@ColumnDefault("0")
@ApiParam(value = "子零件数量", example = "0")

3
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java
Unescape Escape View File

@ -38,6 +38,9 @@ public class StationResultBean<T> implements Serializable {
@ApiParam("List结果集")
private List<T> resultList;
@ApiParam("结果对象")
private Object resultObj;
@ApiParam("Map结果集")
public Map<String, Object> resultMap;

8
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java
Unescape Escape View File

@ -36,6 +36,10 @@ public class MesProcessBom extends BaseBean {
@ApiParam("零件号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("产品物料名称")
private String partName;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@ -57,6 +61,10 @@ public class MesProcessBom extends BaseBean {
@ApiParam("子零件")
private String itemPartNo;
@Column(name = "ITEM_PART_NAME")
@ApiParam("原材料物料名称")
private String itemPartName;
@Column(name = "QTY")
@ColumnDefault("0")
@ApiParam(value = "子零件数量", example = "0")

6
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java
Unescape Escape View File

@ -17,6 +17,10 @@ public class SuitParamModel {
/* 标签名称 */
private String tagName;
/* 标签 Class Path */
private String classPath;
/* 标签 调用的方法名称 */
private String methodName;
/* 标签 id 属性值 */
private String id;
/* 标签 name 属性值 */
@ -24,7 +28,7 @@ public class SuitParamModel {
/* 标签唯一标识 */
private String pathKey;
/* 标签内容 */
private String value;
private String vaule;
/* 标签类型 Default:PARAM_VALUE_TYPE.STRING */
private Integer type; // BlockSoftSwitchEnumUtil.PARAM_VALUE_TYPE

Write Preview
Loading…
Cancel
Save