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

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

Browse Source
yun-zuoyi
wynne1005 5 years ago
parent f6b16b9828 a22d3d2333
commit a2914a4320
5 changed files with 147 additions and 51 deletions
Show Stats Download Patch File Download Diff File

2
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java
Unescape Escape View File

@ -43,4 +43,6 @@ public @interface DynamicField {
String searchColumnName() default "";
// 回显列名
String explicitColumnName() default "";
// 下拉框规则
WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE selectRule() default WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_ENUM;
}

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

@ -5238,4 +5238,67 @@ public class WmsEnumUtil {
return tmp;
}
}
/**
* 动态查询-下拉框规则
* 默认为 10
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DYNAMIC_FIELD_SELECT_RULE {
SINGLE_ENUM(10, "SINGLE_ENUM", "单选枚举"),
MULTIPLE_ENUM(20, "MULTIPLE_ENUM", "多选枚举"),
SINGLE_URL(30, "SINGLE_URL", "单选接口"),
MULTIPLE_URL(40, "MULTIPLE_URL", "多选接口");
private int value;
private String code;
private String description;
DYNAMIC_FIELD_SELECT_RULE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static DYNAMIC_FIELD_SELECT_RULE codeOf(int value) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
return null;
}
public static String valueOf(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 int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
}

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

@ -75,17 +75,19 @@ public class WmsPart extends BaseBean {
@Column(name = "STOCK_UNIT")
@ApiParam(value = "库存单位")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL,
isRequire = 2, entityName = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode")
private String stockUnit;
@Column(name = "ABC")
@ApiParam(value = "分类")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_ABC")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String abc;
@Column(name = "BUY_UNIT")
@ApiParam(value = "采购单位")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL,
isRequire = 2, entityName = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode")
private String buyUnit;
@Column(name = "BU2SU", columnDefinition = "decimal(18,8)")
@ -95,7 +97,8 @@ public class WmsPart extends BaseBean {
@Column(name = "PRICE_UNIT")
@ApiParam(value = "计价单位")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL,
isRequire = 2, entityName = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode")
private String priceUnit;
@Column(name = "PU2SU", columnDefinition = "decimal(18,8)")
@ -126,12 +129,14 @@ public class WmsPart extends BaseBean {
@Column(name = "PART_GROUP")
@ApiParam(value = "物料组")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL,
isRequire = 2, entityName = "/wms/wms-enum/dictionary/code?code=PART_GROUP_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue")
private String partGroup;
@Column(name = "LOT_CHECK_RULE")
@ApiParam(value = "批次校验规则")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL,
isRequire = 2, entityName = "/wms/wms-enum/dictionary/code?code=LOT_CHECK_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue")
private String lotCheckRule;
@Column(name = "SN_CONTROL")
@ -162,12 +167,12 @@ public class WmsPart extends BaseBean {
@Column(name = "OUT_CLOSE_FLAG")
@ApiParam("項目结算标识")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "OUT_CLOSE_FLAG")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String outCloseFlag = "2";
@Column(name = "OUT_CLOSE_TYPE")
@ApiParam("结算方式")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "OUT_CLOSE_TYPE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String outCloseType;
@Column(name = "OUT_CLOSE_VENDOR")
@ -197,7 +202,8 @@ public class WmsPart extends BaseBean {
@Column(name = "PRODUCT_LINES")
@ApiParam("报工产线")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL,
isRequire = 2, entityName = "/wms/work-center/list", listColumnName = "workCenterName", explicitColumnName = "workCenterCode")
private String productLines;
@Column(name = "PROPORTION", columnDefinition = "decimal(10,5)")
@ -233,9 +239,10 @@ public class WmsPart extends BaseBean {
private Integer isProdLot = 2;
@Column(name = "PULL_WAY")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "PULL_WAY_STATUS")
@ApiParam(value = "拉动方式", example = "0")
private Integer pullWay = 0;
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.MULTIPLE_ENUM,
isRequire = 2, entityName = "PULL_WAY_STATUS")
@ApiParam(value = "拉动方式")
private String pullWay;
@Column(name = "CYCLE_RQUEST_PERIOD")
@ApiParam(value = "循环补货周期", example = "0")

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java
Unescape Escape View File

@ -108,4 +108,8 @@ public class WmsFieldInfo extends BaseBean {
@Column(name = "EXPLICIT_COLUMN_NAME")
@ApiParam(value = "回显列名")
private String explicitColumnName;
@Column(name = "DYNAMIC_FIELD_SELECT_RULE")
@ApiParam(value = "下拉框规则")
private Integer selectRule;
}

20
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java
Unescape Escape View File

@ -81,4 +81,24 @@ public class WmsListElement extends BaseBean {
@Column(name = "FUNCTION_ID")
@ApiParam(value = "功能菜单ID")
private Long functionId;
@Column(name = "FIELD_TYPE")
@ApiParam(value = "字段类型")
private Integer fieldType;
@Column(name = "DYNAMIC_FIELD_SELECT_RULE")
@ApiParam(value = "下拉框规则")
private Integer selectRule;
@Column(name = "ENTITY_NAME")
@ApiParam(value = "实体名称")
private String entityName;
@Column(name = "LIST_COLUMN_NAME")
@ApiParam(value = "开窗列表显示列名称")
private String listColumnName;
@Column(name = "EXPLICIT_COLUMN_NAME")
@ApiParam(value = "回显列名")
private String explicitColumnName;
}

Write Preview
Loading…
Cancel
Save