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

Merge branch 'dev' of gragon.xu/i3plus-pojo into dev

Browse Source
yun-zuoyi
王杰 5 years ago committed by nancy.li
parent cfaa7c38bc df03827264
commit cde65d0e7a
11 changed files with 120 additions and 75 deletions
Show Stats Download Patch File Download Diff File

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

@ -34,5 +34,9 @@ public @interface DynamicField {
// 是否跳过本字段扫描 0-不跳过，1-跳过
int isSkip() default 0;
// 下拉枚举名称
String enumName() default "";
String entityName() default "";
// 下拉列表显示列名称,多个列名需要根据逗号分隔
String listColumnName() default "";
// 下拉搜索列名称,多个列名需要根据逗号分隔
String searchColumnName() default "";
}

34
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListSearchModel.java
Unescape Escape View File

@ -0,0 +1,34 @@
package cn.estsh.i3plus.pojo.model.wms;
import cn.estsh.i3plus.pojo.base.common.Pager;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description : WMS列表搜索model
* @Reference :
* @Author : silliter
* @CreateDate : 2020-01-07 14:33
* @Modify:
**/
@Data
public class WmsListSearchModel {
@ApiParam(value = "开窗列表查询key")
private String searchKey;
@ApiParam(value = "开窗列表查询value")
private String searchValue;
@ApiParam(value = "排序参数")
private String orderByParams;
@ApiParam(value = "分页组件")
private Pager pager;
@ApiParam(value = "实体类名")
private String objClassName;
@ApiParam(value = "有效性")
public Integer isValid;
}

5
modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java
Unescape Escape View File

@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.ptl.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.PtlEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -46,7 +45,7 @@ public class PtlControl extends BaseBean implements Serializable {
@Column(name = "CONTROL_TYPE")
@ApiParam("控制器类型")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_CONTROL_TYPE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_CONTROL_TYPE")
private Integer controlType;
@Column(name = "IP")
@ -66,7 +65,7 @@ public class PtlControl extends BaseBean implements Serializable {
@Column(name = "STATUS")
@ApiParam("控制器状态")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_CONTROL_STATUS")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_CONTROL_STATUS")
private Integer status;
@Column(name = "FREQUENCY")

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

@ -43,7 +43,7 @@ public class PtlPart extends BaseBean implements Serializable {
@Column(name = "PART_TYPE")
@ApiParam("物料类型")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_PART_TYPE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_PART_TYPE")
private String partType;
@Column(name = "UNIT")

14
modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java
Unescape Escape View File

@ -64,37 +64,37 @@ public class PtlTag extends BaseBean implements Serializable {
@Column(name = "TAG_TYPE")
@ApiParam("标签类型")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_TAG_TYPE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_TAG_TYPE")
private Integer tagType;
@Column(name = "LIGHT_STATUS")
@ApiParam("亮灯状态")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_LIGHT_STATUS")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_LIGHT_STATUS")
private Integer lightStatus;
@Column(name = "TAG_STATUS")
@ApiParam("标签状态")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_TAG_STATUS")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_TAG_STATUS")
private Integer tagStatus;
@Column(name = "LIGHT_MODE")
@ApiParam("亮灯方式")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_LIGHT_MODE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_LIGHT_MODE")
private Integer lightMode;
@Column(name = "LIGHT_COLOR")
@ApiParam("亮灯颜色")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_LIGHT_COLOR")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_LIGHT_COLOR")
private Integer lightColor;
@Column(name = "IS_BUZZING")
@ApiParam("是否蜂鸣")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_IS_BUZZING")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_IS_BUZZING")
private Integer isBuzzing;
@Column(name = "MUSIC_TYPE")
@ApiParam("音乐类型")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_MUSIC_TYPE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_MUSIC_TYPE")
private Integer musicType;
@Column(name = "DISPLAY_CONTEXT")

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

@ -31,63 +31,63 @@ import java.io.Serializable;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value = "盘点策略表", description = "盘点策略表")
public class WmsCsStrategy extends BaseBean implements Serializable {
public class WmsCsStrategy extends BaseBean implements Serializable {
private static final long serialVersionUID = -1692487594678973549L;
private static final long serialVersionUID = -1692487594678973549L;
@Column(name = "STRATEGY_NAME")
@ApiParam(value = "策略名称")
private String strategyName;
@Column(name = "STRATEGY_NAME")
@ApiParam(value = "策略名称")
private String strategyName;
@Column(name = "part_type")
@ApiParam(value = "物料分类")
@AnnoOutputColumn(refClass = WmsEnumUtil.PART_ABC.class, refForeignKey = "value", value = "description")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PART_ABC")
private String partType;
@Column(name = "part_type")
@ApiParam(value = "物料分类")
@AnnoOutputColumn(refClass = WmsEnumUtil.PART_ABC.class, refForeignKey = "value", value = "description")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_ABC")
private String partType;
@Column(name = "STRATEGY_TYPE")
@ApiParam(value = "策略分类", example = "0")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "CS_STRATEGY_TYPE")
@AnnoOutputColumn(refClass = WmsEnumUtil.CS_STRATEGY_TYPE.class, refForeignKey = "value", value = "description")
private Integer strategyType;
@Column(name = "STRATEGY_TYPE")
@ApiParam(value = "策略分类", example = "0")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "CS_STRATEGY_TYPE")
@AnnoOutputColumn(refClass = WmsEnumUtil.CS_STRATEGY_TYPE.class)
private Integer strategyType;
@Column(name = "CYCLE_RULE")
@ApiParam(value = "循环规则")
private String cycleRule;
@Column(name = "CYCLE_RULE")
@ApiParam(value = "循环规则")
private String cycleRule;
@Column(name = "START_DATE")
@ApiParam(value = "开始日期", example = "0")
private String startDate;
@Column(name = "START_DATE")
@ApiParam(value = "开始日期", example = "0")
private String startDate;
@Column(name = "END_DATE")
@ApiParam(value = "结束日期", example = "0")
private String endDate;
@Column(name = "END_DATE")
@ApiParam(value = "结束日期", example = "0")
private String endDate;
@Column(name = "NUM_MAX")
@ApiParam(value = "明细数量上限")
private Integer numMax;
@Column(name = "NUM_MAX")
@ApiParam(value = "明细数量上限")
private Integer numMax;
@Column(name = "COVERAGE_RATE")
@ApiParam(value = "抽盘覆盖率")
private Double coverageRate;
@Column(name = "COVERAGE_RATE")
@ApiParam(value = "抽盘覆盖率")
private Double coverageRate;
@Column(name = "ZONE_NOS")
@ApiParam(value = "存储区")
private String zoneNos;
@Column(name = "ZONE_NOS")
@ApiParam(value = "存储区")
private String zoneNos;
@Column(name = "LOCATES")
@ApiParam(value = "盘点库位")
private String locates;
@Column(name = "LOCATES")
@ApiParam(value = "盘点库位")
private String locates;
@Column(name = "last_run_time")
@ApiParam(value = "上次运行时间")
private String lastRunTime;
@Column(name = "last_run_time")
@ApiParam(value = "上次运行时间")
private String lastRunTime;
@Column(name = "next_run_time")
@ApiParam(value = "下次运行时间")
private String nextRunTime;
@Column(name = "next_run_time")
@ApiParam(value = "下次运行时间")
private String nextRunTime;
@Column(name = "REMAKE")
@ApiParam(value = "备注")
private String remake;
@Column(name = "REMAKE")
@ApiParam(value = "备注")
private String remake;
}

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

@ -47,7 +47,7 @@ public class WmsLocate extends BaseBean {
*/
@Column(name = "LOCATE_TYPE")
@ApiParam(value = "库位类型")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, enumName = "LOCATE_TYPE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, entityName = "LOCATE_TYPE")
private Integer locateType;
@Column(name = "WH_NO")
@ -102,7 +102,7 @@ public class WmsLocate extends BaseBean {
@Column(name = "STATUS")
@ApiParam(value = "库位状态", example = "-1")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, enumName = "LOCATE_STATUS")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, entityName = "LOCATE_STATUS")
private Integer status;
@Column(name = "MAX_PACKAGE_QTY")

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

@ -50,7 +50,7 @@ public class WmsPart extends BaseBean {
@Column(name = "PART_TYPE")
@ApiParam(value = "物料类型")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "WMS_PART_TYPE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "WMS_PART_TYPE")
@AnnoOutputColumn(refClass = WmsEnumUtil.WMS_PART_TYPE_STR.class, refForeignKey = "value", value = "description")
private String partType;
@ -112,7 +112,7 @@ public class WmsPart extends BaseBean {
@ColumnDefault("2")
@Column(name = "IQC")
@ApiParam(value = "是否免检", example = "1")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE")
private Integer iqc;
@Column(name = "MIN", columnDefinition = "decimal(18,8)")
@ -137,7 +137,7 @@ public class WmsPart extends BaseBean {
@Column(name = "SN_CONTROL")
@ApiParam(value = "是否条码管理", example = "1")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE")
private Integer snControl;
@Column(name = "VENDOR_NO")
@ -182,7 +182,7 @@ public class WmsPart extends BaseBean {
@Column(name = "IS_REPORT_PARTNO")
@ApiParam("是否报工零件")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE")
private Integer isReportPartNo;
@Column(name = "REPORT_LOCATE_NO")
@ -207,7 +207,7 @@ public class WmsPart extends BaseBean {
@Column(name = "IS_VALUABLE", columnDefinition = "int default 2")
@ApiParam(value = "是否贵重")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "IS_VALUABLE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "IS_VALUABLE")
@AnnoOutputColumn(refClass = WmsEnumUtil.IS_VALUABLE.class, refForeignKey = "value", value = "description")
private Integer isValuable;
@ -228,12 +228,12 @@ public class WmsPart extends BaseBean {
private Double verbNum;
@Column(name = "IS_PROD_LOT")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE")
@ApiParam(value = "是否录入生产批次", example = "1")
private Integer isProdLot = 2;
@Column(name = "PULL_WAY")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "PULL_WAY_STATUS")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "PULL_WAY_STATUS")
@ApiParam(value = "拉动方式", example = "0")
private Integer pullWay = 0;

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

@ -74,7 +74,7 @@ public class WmsSnOperateRecord extends BaseBean {
@Column(name = "OPERATE_TYPE")
@ApiParam(value = "操作类型")
@AnnoOutputColumn(refClass = WmsEnumUtil.SN_OPERATE_TYPE.class, refForeignKey = "value", value = "description")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "SN_OPERATE_TYPE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "SN_OPERATE_TYPE")
private Integer operateType;
@Column(name = "ref_sn")

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

@ -60,32 +60,32 @@ public class WmsZones extends BaseBean {
@Column(name = "IS_SON_NODE")
@ApiParam(value = "是否子节点")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, enumName = "TRUE_OR_FALSE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, entityName = "TRUE_OR_FALSE")
private Integer isSonNode;
@Column(name = "IS_PM")
@ApiParam(value = "零件级管控", example = "2")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE")
private Integer isPm;
@Column(name = "IS_LM")
@ApiParam(value = "批次级管控", example = "2")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE")
private Integer isLm;
@Column(name = "IS_SN")
@ApiParam(value = "条码级管控", example = "1")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE")
private Integer isSn;
@Column(name = "IS_MIX")
@ApiParam(value = "允许混淆", example = "1")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE")
private Integer isMix;
@Column(name = "IS_SC")
@ApiParam(value = "库容检查", example = "1")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE")
private Integer isSc;
@Column(name = "STRATEGY")
@ -95,12 +95,12 @@ public class WmsZones extends BaseBean {
@Column(name = "IS_NEGATIVE")
@ApiParam(value = "允许负库存", example = "1")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE")
private Integer isNegative;
@Column(name = "CHECK_FIFO")
@ApiParam(value = "校验先进先出", example = "1")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE")
private Integer checkFifo;
@Column(name = "ZONE_LENGTH", columnDefinition = "decimal(18,8)")

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

@ -92,4 +92,12 @@ public class WmsFieldInfo extends BaseBean {
@Column(name = "CONDITION_CONNECTOR")
@ApiParam(value = "条件连接符:and/or")
private String conditionConnector;
@Column(name = "LIST_COLUMNNAME")
@ApiParam(value = "开窗列表显示列名称")
private String listColumnName;
@Column(name = "SEARCH_COLUMNNAME")
@ApiParam(value = "开窗搜索列名称")
private String searchColumnName;
}

Write Preview
Loading…
Cancel
Save