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

Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev

Browse Source
yun-zuoyi
王杰 5 years ago committed by nancy.li
parent 1a74363541 b1018dbd39
commit ed61052742
19 changed files with 256 additions and 119 deletions
Show Stats Download Patch File Download Diff File

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

@ -11,6 +11,113 @@ import com.fasterxml.jackson.annotation.JsonFormat;
public class PtlEnumUtil {
/**
* 作业流程类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ACTION_ROUTE_TYPE {
GEN_TASK(10, "GEN_TASK", "生成任务"),
OFF_TAG(20, "OFF_TAG", "灭灯");
private int value;
private String code;
private String description;
ACTION_ROUTE_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;
}
}
/**
* 状态机执行方法
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ROUTE_EVENT {
TRIGGER(10, "trigger", "触发"),
ENTRY(20, "entry", "进入状态"),
EXIT(30, "exit", "离开状态");
private int value;
private String code;
private String description;
ROUTE_EVENT(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;
}
}
/**
* 组件参数类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ACTION_MODULE_PARAM_TYPE {
QUALIFIED(10, "number", "数字"),
DEFECTED(20, "text", "字符串"),
SCRAPED(30, "select", "可选值"),
BUTTON(40, "button", "按钮");
private int value;
private String code;
private String description;
ACTION_MODULE_PARAM_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 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;
}
}
/**
* 标签类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.base.enumutil;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.util.StringUtils;
import static cn.estsh.i3plus.pojo.base.enumutil.PtlPcnEnumUtil.MONITOR_PROCESS_MESSAGE_TYPE.*;
/**
* @author Wynne.Lu
* @date 2020/2/12 17:41
@ -547,8 +549,11 @@ public class PtlPcnEnumUtil {
}
/**
* 状态机执行方法
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum RouteEvent {
public enum ROUTE_EVENT {
TRIGGER(10, "trigger", "触发"),
ENTRY(20, "entry", "进入状态"),
EXIT(30, "exit", "离开状态");
@ -557,7 +562,7 @@ public class PtlPcnEnumUtil {
private String code;
private String description;
RouteEvent(int value, String code, String description) {
ROUTE_EVENT(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
@ -576,8 +581,11 @@ public class PtlPcnEnumUtil {
}
}
/**
* 流程状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum RouteState {
public enum ROUTE_STATE {
START(10, "START", "开启流程"),
TERMINATE(20, "TERMINATE", "终止流程"),
FINISH(30, "FINISH", "结束流程");
@ -586,7 +594,7 @@ public class PtlPcnEnumUtil {
private String code;
private String description;
RouteState(int value, String code, String description) {
ROUTE_STATE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
@ -605,6 +613,9 @@ public class PtlPcnEnumUtil {
}
}
/**
* 标签类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TAG_TYPE {
BIN_TAG(10, "库位标签"),
@ -639,15 +650,18 @@ public class PtlPcnEnumUtil {
}
}
/**
* 流程状态-触发类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TriggerType {
public enum TRIGGER_TYPE {
INNER_TRIGGER(10, "内部触发"),
OUTER_TRIGGER(20, "外部触发");
private int value;
private String description;
TriggerType(int value, String description) {
TRIGGER_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
@ -661,8 +675,11 @@ public class PtlPcnEnumUtil {
}
}
/**
* 作业流程类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum RouteType {
public enum ACTION_ROUTE_TYPE {
GEN_TASK(10, "GEN_TASK", "生成任务"),
OFF_TAG(20, "OFF_TAG", "灭灯");
@ -670,7 +687,7 @@ public class PtlPcnEnumUtil {
private String code;
private String description;
RouteType(int value, String code, String description) {
ACTION_ROUTE_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
@ -689,6 +706,9 @@ public class PtlPcnEnumUtil {
}
}
/**
* 监听消息类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MONITOR_PROCESS_MESSAGE_TYPE {
CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"),
@ -732,7 +752,7 @@ public class PtlPcnEnumUtil {
if (StringUtils.isEmpty(code)) {
return null;
}
for (MONITOR_PROCESS_MESSAGE_TYPE enums : MONITOR_PROCESS_MESSAGE_TYPE.values()) {
for (MONITOR_PROCESS_MESSAGE_TYPE enums : values()) {
if (enums.getCode().equals(code)) {
return enums;
}
@ -741,6 +761,9 @@ public class PtlPcnEnumUtil {
}
}
/**
* 界面消息类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum INTERFACE_SIGNAL_MESSAGE_TYPE {
CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"),
@ -794,7 +817,7 @@ public class PtlPcnEnumUtil {
}
/**
* 生成任务actor message type
* 任务消息类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum GEN_TASK_MESSAGE_TYPE {
@ -841,8 +864,11 @@ public class PtlPcnEnumUtil {
}
}
/**
* websocket业务类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WsBusiType {
public enum WS_BUSI_TYPE {
MONITOR_PROCESS(10, "MONITOR_PROCESS", "控制器相关"),
INTERFACE_PROCESS(20, "INTERFACE_PROCESS", "界面处理");
@ -850,7 +876,7 @@ public class PtlPcnEnumUtil {
private String code;
private String description;
WsBusiType(int value, String code, String description) {
WS_BUSI_TYPE(int value, String code, String description) {
this.value = value;
this.description = description;
this.code = code;
@ -869,8 +895,11 @@ public class PtlPcnEnumUtil {
}
}
/**
* websocket消息类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WsDataType {
public enum WS_DATA_TYPE {
TEXT(10, "TEXT", "正常信息"),
EXP_TEXT(20, "EXP_TEXT", "异常信息"),
TABLE(30, "TABLE", "表格");
@ -879,7 +908,7 @@ public class PtlPcnEnumUtil {
private String code;
private String description;
WsDataType(int value, String code, String description) {
WS_DATA_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
@ -898,6 +927,9 @@ public class PtlPcnEnumUtil {
}
}
/**
* 组件状态类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STATUS_TYPE {
START(10, "START", "开始状态"),

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

@ -0,0 +1,54 @@
package cn.estsh.i3plus.pojo.ptl.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @author wangjie
* @date 2020/2/12 17:41
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "PTL_ACTION_MODULE_PARAM")
@EqualsAndHashCode(callSuper = true)
@Api("组件参数")
public class PtlActionModuleParam extends BaseBean implements Serializable {
private static final long serialVersionUID = -1015028092547846989L;
@Column(name = "AM_CODE")
@ApiParam("组件代码")
private String amCode;
@Column(name = "PARAM_CODE")
@ApiParam("参数代码")
private String paramCode;
@Column(name = "PARAM_NAME")
@ApiParam("参数名称")
private String paramName;
@Column(name = "PARAM_TYPE")
@ApiParam("参数类型")
private String paramType;
@Column(name = "DEFAULT_VALUE")
@ApiParam("默认值")
private String defaultValue;
}

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

@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
import java.io.Serializable;
@ -40,4 +41,9 @@ public class PtlActionRoute extends BaseBean implements Serializable {
@Column(name = "ROUTE_TYPE")
@ApiParam("流程类型")
private Integer routeType;
@Lob
@Column(name = "POSITION")
@ApiParam("GOJS位置")
private String position;
}

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

@ -1,9 +1,7 @@
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.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -37,11 +35,9 @@ public class PtlArea extends BaseBean implements Serializable {
@Column(name = "AREA_NO")
@ApiParam("区域代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String areaNo;
@Column(name = "AREA_NAME")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("区域名称")
private String areaName;

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

@ -1,9 +1,7 @@
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.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -34,26 +32,21 @@ public class PtlAreaActorAction extends BaseBean implements Serializable {
@Column(name = "AREA_NO")
@ApiParam("区域代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String areaNo;
@Column(name = "ACTOR_CODE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("观察者编码")
private String actorCode;
@Column(name = "MT_CODE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("消息类型代码")
private String mtCode;
@Column(name = "OTHER_WHERE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("特定条件")
private String otherWhere;
@Column(name = "AMG_ID")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("组件集编号")
private Long amgId;
}

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

@ -1,9 +1,7 @@
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.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -34,31 +32,25 @@ public class PtlAreaRouteModuleParam extends BaseBean implements Serializable {
@Column(name = "AREA_NO")
@ApiParam("区域代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String areaNo;
@Column(name = "ROUTE_CODE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("流程代码")
private String routeCode;
@Column(name = "AMG_ID")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("组件集编号")
private Long amgId;
@Column(name = "AM_CODE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("组件代码")
private String amCode;
@Column(name = "PARAM_CODE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("参数代码")
private String paramCode;
@Column(name = "PARAM_VALUE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("参数值")
private String paramValue;

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

@ -1,8 +1,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.WmsEnumUtil;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -13,7 +11,6 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
/**
* @author Wynne.Lu
@ -32,61 +29,49 @@ public class PtlBom extends BaseBean implements Serializable {
@Column(name = "PART_NO")
@ApiParam("父物料号")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String partNo;
@Column(name = "PART_NAME", columnDefinition = "varchar(255) default '1'", nullable = false)
@ApiParam("父物料描述")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String partName;
@Column(name = "UNIT")
@ApiParam("计量单位")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String unit;
@Column(name = "QTY")
@ApiParam("数量")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private Double qty;
@Column(name = "ITEM_PART_NO")
@ApiParam("子物料号")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String itemPartNo;
@Column(name = "ITEM_PART_NAME")
@ApiParam("子物料描述")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String itemPartName;
@Column(name = "ITEM_UNIT")
@ApiParam("子计量单位")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String itemUnit;
@Column(name = "ITEM_QTY")
@ApiParam("子用量")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private Integer itemQty;
@Column(name = "BOM_NUM")
@ApiParam("BOM编号")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String bomNum;
@Column(name = "BOM_VERSION")
@ApiParam("BOM版本号")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String bomVersion;
@Column(name = "EFF_START_TIME")
@ApiParam("有效起始日期")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String effStartTime;
@Column(name = "EFF_END_TIME")
@ApiParam("有效截止日期")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String effEndTime;
}

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

@ -1,9 +1,7 @@
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.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -35,42 +33,34 @@ public class PtlControl extends BaseBean implements Serializable {
@Column(name = "CONTROL_NO")
@ApiParam("控制器编号")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String controlNo;
@Column(name = "CONTROL_NAME")
@ApiParam("控制器名称")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String controlName;
@Column(name = "CONTROL_TYPE")
@ApiParam("控制器类型")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_CONTROL_TYPE")
private Integer controlType;
@Column(name = "IP")
@ApiParam("ip地址")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String ip;
@Column(name = "PORT")
@ApiParam("端口地址")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String port;
@Column(name = "AREA_NO")
@ApiParam("区域代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String areaNo;
@Column(name = "STATUS")
@ApiParam("控制器状态")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_CONTROL_STATUS")
private Integer status;
@Column(name = "FREQUENCY")
@ApiParam("监听频率")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
private Integer frequency;
@Version

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

@ -1,9 +1,7 @@
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.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -34,26 +32,21 @@ public class PtlIf extends BaseBean implements Serializable {
@Column(name = "IF_CODE")
@ApiParam("接口代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String ifCode;
@Column(name = "IF_NAME")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("接口名称")
private String ifName;
@Column(name = "IF_CONNECT_TYPE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
@ApiParam("交互方式")
private String ifConnectType;
@Column(name = "IF_CLASS")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
@ApiParam("接口实现类")
private String ifClass;
@Column(name = "IF_CALL_TYPE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
@ApiParam("接口调用方向")
private String ifCallType;
}

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

@ -1,8 +1,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.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -33,22 +31,18 @@ public class PtlPart extends BaseBean implements Serializable {
@Column(name = "PART_NO")
@ApiParam("物料编号")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String partName;
@Column(name = "PART_TYPE")
@ApiParam("物料类型")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_PART_TYPE")
private String partType;
@Column(name = "UNIT")
@ApiParam("单位")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String unit;
}

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

@ -1,9 +1,7 @@
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.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -34,26 +32,21 @@ public class PtlRfid extends BaseBean implements Serializable {
@Column(name = "RFID_CONTROL_NO")
@ApiParam("RFID读写器代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String rfidControlNo;
@Column(name = "IP")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("IP")
private String ip;
@Column(name = "PORT")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("端口号")
private String port;
@Column(name = "AREA_NO")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
@ApiParam("区域代码")
private String areaNo;
@Column(name = "RFID_VALUE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("rfid内容")
private String rfidValue;
}

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

@ -1,9 +1,7 @@
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.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -35,22 +33,18 @@ public class PtlSection extends BaseBean implements Serializable {
@Column(name = "SECTION_NO")
@ApiParam("区段编号")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String sectionNo;
@Column(name = "SECTION_NAME")
@ApiParam("区段名称")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String sectionName;
@Column(name = "SECTION_SEQ")
@ApiParam("区段顺序号")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
private Integer sectionSeq;
@Column(name = "AREA_NO")
@ApiParam("区域代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String areaNo;
@Transient

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

@ -1,9 +1,7 @@
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.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -34,82 +32,66 @@ public class PtlTag extends BaseBean implements Serializable {
@Column(name = "TAG_NO")
@ApiParam("标签代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
private Integer tagNo;
@Column(name = "CONTROL_NO")
@ApiParam("控制器代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String controlNo;
@Column(name = "AREA_NO")
@ApiParam("区域代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String areaNo;
@Column(name = "SECTION_NO")
@ApiParam("区段代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String sectionNo;
@Column(name = "PART_NO")
@ApiParam("物料编号")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String partNo;
@Column(name = "BIN_NO")
@ApiParam("BIN位代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String binNo;
@Column(name = "TAG_TYPE")
@ApiParam("标签类型")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_TAG_TYPE")
private Integer tagType;
@Column(name = "LIGHT_STATUS")
@ApiParam("亮灯状态")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_LIGHT_STATUS")
private Integer lightStatus;
@Column(name = "TAG_STATUS")
@ApiParam("标签状态")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_TAG_STATUS")
private Integer tagStatus;
@Column(name = "LIGHT_MODE")
@ApiParam("亮灯方式")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_LIGHT_MODE")
private Integer lightMode;
@Column(name = "LIGHT_COLOR")
@ApiParam("亮灯颜色")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_LIGHT_COLOR")
private Integer lightColor;
@Column(name = "IS_BUZZING")
@ApiParam("是否蜂鸣")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_IS_BUZZING")
private Integer isBuzzing;
@Column(name = "MUSIC_TYPE")
@ApiParam("音乐类型")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_MUSIC_TYPE")
private Integer musicType;
@Column(name = "DISPLAY_CONTEXT")
@ApiParam("显示内容")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String displayContent;
@Column(name = "ERROR_COUNT")
@ApiParam("卡键次数")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
private Integer errorCount;
@Column(name = "CUSTOM_ATTRIBUTE")
@ApiParam("自定义属性")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String customAttribute;
}

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

@ -1,9 +1,7 @@
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.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -14,10 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
/**
* @author Wynne.Lu
@ -37,11 +32,9 @@ public class PtlWindow extends BaseBean implements Serializable {
@Column(name = "WINDOW_NO")
@ApiParam("界面代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String windowNo;
@Column(name = "WINDOW_NAME")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("界面名称")
private String windowName;
}

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

@ -1,9 +1,7 @@
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.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -34,11 +32,9 @@ public class PtlWindowElement extends BaseBean implements Serializable {
@Column(name = "WINDOW_NO")
@ApiParam("界面代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String windowNo;
@Column(name = "ELEMENT_NO")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("元素代码")
private String elementNo;
}

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

@ -1,9 +1,7 @@
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.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -34,21 +32,17 @@ public class PtlWindowElementAttribute extends BaseBean implements Serializable
@Column(name = "WINDOW_NO")
@ApiParam("界面代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String windowNo;
@Column(name = "ELEMENT_NO")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("元素代码")
private String elementNo;
@Column(name = "ATTRIBUTE_NO")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("属性代码")
private String attributeNo;
@Column(name = "ATTRIBUTE_VALUE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("属性值")
private String attributeValue;

15
modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActionRouteRepository.java
Unescape Escape View File

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.ptl.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.ptl.bean.PtlActionRoute;
/**
* @author wangjie
* @date 2020/2/12 17:41
* @desc
*/
public interface PtlActionRouteRepository extends BaseRepository<PtlActionRoute, Long> {
}

28
modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java
Unescape Escape View File

@ -306,4 +306,32 @@ public class PtlHqlPack {
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", result);
return result;
}
/**
* 流程查询条件封装
*
* @param actionRoute
* @return
*/
public static DdlPackBean packHqlPtlActionRoute(PtlActionRoute actionRoute, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(actionRoute, organizeCode);
DdlPreparedPack.getStringLikerPack(actionRoute.getRouteCode(), "routeCode", packBean);
DdlPreparedPack.getStringLikerPack(actionRoute.getRouteName(), "routeName", packBean);
DdlPreparedPack.getNumEqualPack(actionRoute.getRouteType(), "routeType", packBean);
return packBean;
}
/**
* 区域流程查询条件封装
* @param areaRoute
* @param organizeCode
* @return
*/
public static DdlPackBean packHqlPtlAreaRoute(PtlAreaRoute areaRoute, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(areaRoute, organizeCode);
DdlPreparedPack.getStringLikerPack(areaRoute.getRouteCode(), "routeCode", packBean);
DdlPreparedPack.getStringLikerPack(areaRoute.getAreaNo(), "areaNo", packBean);
DdlPreparedPack.getNumEqualPack(areaRoute.getRouteType(), "routeType", packBean);
return packBean;
}
}

Write Preview
Loading…
Cancel
Save