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
许心洁 5 years ago
parent 632ad62c45 1aec8a2f5f
commit 7ffb5d2c98
23 changed files with 1017 additions and 11 deletions
Show Stats Download Patch File Download Diff File

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

@ -1,5 +1,7 @@
package cn.estsh.i3plus.pojo.base.enumutil;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
* @author Wynne.Lu
* @date 2020/2/12 17:41
@ -7,4 +9,418 @@ package cn.estsh.i3plus.pojo.base.enumutil;
*/
public class PtlEnumUtil {
/**
* 标签类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PTL_TAG_TYPE {
LOCATION_TAG(10, "库位标签"),
COMPLATE_TAG(20, "完成器标签"),
TAG_MONITOR(30, "标签显示器"),
TAG_SCAN_INTERFACE(40, "标签扫描接口");
private int value;
private String description;
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
private PTL_TAG_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
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;
}
}
/**
* 亮灯状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PTL_LIGHT_STATUS {
LIGHT_OFF(10, "灭灯"),
COMPLATE_ON(20, "亮点");
private int value;
private String description;
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
private PTL_LIGHT_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
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;
}
}
/**
* 标签状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PTL_TAG_STATUS {
NORMAL(10, "正常"),
UNAVAILABLE(20, "不可用");
private int value;
private String description;
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
private PTL_TAG_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
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;
}
}
/**
* 亮灯方式
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PTL_LIGHT_MODE {
LIGHT(10, "常亮"),
TWINKLE(20, "闪烁");
private int value;
private String description;
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
private PTL_LIGHT_MODE(int value, String description) {
this.value = value;
this.description = description;
}
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;
}
}
/**
* 亮灯颜色
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PTL_LIGHT_COLOR {
WHITE(10, "白色"),
RED(20, "红色"),
GREEN(30, "绿色"),
BLUE(40, "蓝色"),
YELLOW(50, "黄色");
private int value;
private String description;
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
private PTL_LIGHT_COLOR(int value, String description) {
this.value = value;
this.description = description;
}
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;
}
}
/**
* 是否蜂鸣
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PTL_IS_BUZZING {
YES(1, "是"),
NO(2, "否");
private int value;
private String description;
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
private PTL_IS_BUZZING(int value, String description) {
this.value = value;
this.description = description;
}
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;
}
}
/**
* 控制器类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PTL_CONTROL_TYPE {
ATOP(10, "上尚"),
AIOI(20, "爱欧");
private int value;
private String description;
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
private PTL_CONTROL_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
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;
}
}
/**
* 控制器状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PTL_CONTROL_STATUS {
CONNECT(10, "连接"),
BREAK(20, "断开");
private int value;
private String description;
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
private PTL_CONTROL_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
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;
}
}
/**
* 物料类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PTL_PART_TYPE {
RAW_MATERIAL("10", "原材料"),
PARTIALLY_PREPARED_PRODUCTS("20", "半成品"),
FINISHED_PRODUCT("30", "成品");
private String value;
private String description;
private PTL_PART_TYPE(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String descriptionOfValue(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(val)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* 任务类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PTL_TASK_TYPE {
JIT_TASK("10", "JIT任务"),
BILL_TASK("20", "单据任务"),
SINGLE_POINT_TASK("30", "单点任务");
private String value;
private String description;
private PTL_TASK_TYPE(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String descriptionOfValue(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(val)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* 任务状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PTL_TASK_STATUS {
CREATE(10, "创建"),
EXECUTION(20, "执行中"),
COMPLETE(30, "完成"),
CANCEL(40, "取消");
private int value;
private String description;
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
private PTL_TASK_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
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;
}
}
}

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

@ -468,7 +468,7 @@ public class PtlPcnEnumUtil {
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TagType {
public enum TAG_TYPE {
BIN_TAG(10, "库位标签"),
FINALIZER_TAG(20, "完成器标签"),
SCREEN_TAG(30, "标签显示器"),
@ -477,11 +477,21 @@ public class PtlPcnEnumUtil {
private int value;
private String description;
TagType(int value, String description) {
TAG_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
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 int getValue() {
return value;
}
@ -546,7 +556,7 @@ public class PtlPcnEnumUtil {
CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"),
DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"),
LIGHT_ON_CMD(30, "LIGHT_ON_CMD", "lightOnService", "亮灯命令"),
LIGHT_OFF_CMD(40, "LIGHT_OFF_CMD", "", "灭灯命令"),
LIGHT_OFF_CMD(40, "LIGHT_OFF_CMD", "lightOffService", "灭灯命令"),
CONTROL_SIGNAL_CMD(50, "CONTROL_SIGNAL_CMD", "controlSignalService", "控制器反馈信号"),
INTERFACE_SIGNAL_CMD(60, "INTERFACE_SIGNAL_CMD", "", "发送给界面actor通过websocket返回");
@ -593,9 +603,14 @@ public class PtlPcnEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum InterfaceSignalMessageType {
CONNECT_CONTROL_CMD(10, "111111", "connectControlService", "连接控制器"),
DISCONNECT_CONTROL_CMD(20, "222222", "disconnectControlService", "断开控制器"),
LIGHT_ON_CMD(30, "333333", "lightOnService", "亮灯命令");
CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"),
DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"),
REFRESH_CONTROL_CMD(30, "REFRESH_CONTROL_CMD", "refreshControlService", "刷新"),
SCAN_CONTROL_CMD(40, "SCAN_CONTROL_CMD", "scanControlService", "扫描"),
INIT_CONTROL_CMD(50, "INIT_MODULE_CONTROL_CMD", "initModuleControlService", "初始化页面");
// UNLOCK_CONTROL_CMD(50, "UNLOCK_CONTROL_CMD", "unlockControlService", "解锁"),
// LABEL_SELF_CHECK_CONTROL_CMD(60, "labelSelfCheck", "labelSelfCheckControlService", "标签自检"),
// LIGHT_DETAIL_CONTROL_CMD(70, "LABEL_SELF_CHECK_CONTROL_CMD", "lightDetailControlService", "亮灯明细");
private int value;
private String code;
@ -640,7 +655,8 @@ public class PtlPcnEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WsBusiType {
MONITOR_PROCESS(10, "MONITOR_PROCESS", "控制器相关");
MONITOR_PROCESS(10, "MONITOR_PROCESS", "控制器相关"),
INTERFACE_PROCESS(10, "INTERFACE_PROCESS", "界面处理");
private int value;
private String code;
@ -694,7 +710,7 @@ public class PtlPcnEnumUtil {
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum StatusType {
public enum STATUS_TYPE {
START(10, "START", "开始状态"),
FINISH(20, "FINISH", "完成状态"),
TERMINATE(30, "TERMINATE", "中断状态");
@ -703,7 +719,198 @@ public class PtlPcnEnumUtil {
private String code;
private String description;
StatusType(int value, String code, String description) {
STATUS_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 PtlControlStatus {
CONNECT(10, "CONNECT", "连接"),
DISCONNECT(20, "DISCONNECT", "断开");
private int value;
private String code;
private String description;
PtlControlStatus(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 SectionTaskDetailStatus {
CREATE(10, "CREATE", "创建"),
COMPLETE(20, "COMPLETE", "完成");
private int value;
private String code;
private String description;
SectionTaskDetailStatus(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;
}
}
/**
* 生成任务actor message type
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum GenTaskMessageType {
GEN_TASK_CMD(10, "GEN_TASK_CMD", "", "生成任务");
private int value;
private String code;
private String callClass;
private String description;
GenTaskMessageType(int value, String code, String callClass, String description) {
this.value = value;
this.code = code;
this.callClass = callClass;
this.description = description;
}
public int getValue() {
return value;
}
public String getCallClass() {
return callClass;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
public static InterfaceSignalMessageType getTypeByValue(String code) {
if (StringUtils.isEmpty(code)) {
return null;
}
for (InterfaceSignalMessageType enums : InterfaceSignalMessageType.values()) {
if (enums.getCode().equals(code)) {
return enums;
}
}
return null;
}
}
/**
* PTL_区段亮灯任务明细状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TASK_DETAIL_STATUS {
CREATE(10, "CREATE", "新建"),
RECEIPT_FINISH(20, "RECEIPT_FINISH", "已完成");
private int value;
private String code;
private String description;
TASK_DETAIL_STATUS(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 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;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
* PTL_区段、区域亮灯任务状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum AREA_SECTION_TASKL_STATUS {
CREATE(10, "CREATE", "新建"),
RECEIPT(20, "RECEIPT", "执行中"),
RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成");
private int value;
private String code;
private String description;
AREA_SECTION_TASKL_STATUS(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
@ -720,6 +927,87 @@ public class PtlPcnEnumUtil {
public String getDescription() {
return description;
}
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;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
* PTL_主任务状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PTL_MAIN_TASK_STATUS {
CREATE(10, "CREATE", "新建"),
RECEIPT(20, "RECEIPT", "执行中"),
RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"),
CANCELLED(40, "CANCELLED", "已取消");
private int value;
private String code;
private String description;
PTL_MAIN_TASK_STATUS(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 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;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
}

2
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.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;
@ -45,6 +46,7 @@ public class MesPcnSyncErrorLog extends BaseBean implements Serializable {
@ApiParam("异常位置")
private String errorSpot;
@Lob
@Column(name = "ERROR_CONTENT")
@ApiParam("异常内容")
private String errorContent;

2
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.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;
@ -45,6 +46,7 @@ public class MesPcnSyncErrorLog extends BaseBean implements Serializable {
@ApiParam("异常位置")
private String errorSpot;
@Lob
@Column(name = "ERROR_CONTENT")
@ApiParam("异常内容")
private String errorContent;

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

@ -1,7 +1,9 @@
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;
@ -32,9 +34,11 @@ 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;

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

@ -60,7 +60,7 @@ public class PtlAreaSectionTaskDetail extends BaseBean implements Serializable {
@Column(name = "QTY")
@ApiParam("拣货数量")
private Integer qty;
private Integer qty = 0;
@Column(name = "LIGHT_MODE")
@ApiParam("亮灯方式")

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

@ -1,6 +1,8 @@
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;
@ -30,49 +32,61 @@ 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")
@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.DATETIME)
private Date effStartTime;
@Column(name = "EFF_END_TIME")
@ApiParam("有效截止日期")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME)
private Date effEndTime;
}

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

@ -1,7 +1,10 @@
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;
import lombok.Data;
@ -32,34 +35,42 @@ 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, enumName = "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, enumName = "PTL_CONTROL_STATUS")
private Integer status;
@Column(name = "FREQUENCY")
@ApiParam("监听频率")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
private Integer frequency;
}

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

@ -0,0 +1,48 @@
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 adair.song
* @date 2020/2/12 17:41
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "PTL_MAIN_TASK_DETAIL")
@EqualsAndHashCode(callSuper = true)
@Api("主任务明细")
public class PtlMainTaskDetail extends BaseBean implements Serializable {
private static final long serialVersionUID = 7144785793974319897L;
@Column(name = "TASK_NO")
@ApiParam("主任务编号")
private String taskNo;
@Column(name = "PART_NO")
@ApiParam("产品物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("产品物料名称")
private String partName;
@Column(name = "QTY")
@ApiParam("数量")
private Integer qty;
}

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

@ -0,0 +1,54 @@
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;
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 adair.song
* @date 2020/2/25 10:14
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "PTL_PART")
@EqualsAndHashCode(callSuper = true)
@Api("物料")
public class PtlPart extends BaseBean implements Serializable {
private static final long serialVersionUID = -7451758045686558893L;
@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, enumName = "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/PtlSection.java
Unescape Escape View File

@ -1,7 +1,9 @@
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;
@ -32,17 +34,22 @@ 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;
}

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

@ -1,7 +1,9 @@
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;
@ -32,62 +34,77 @@ 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, enumName = "PTL_TAG_TYPE")
private Integer tagType;
@Column(name = "LIGHT_STATUS")
@ApiParam("亮灯状态")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_LIGHT_STATUS")
private Integer lightStatus;
@Column(name = "TAG_STATUS")
@ApiParam("标签状态")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_TAG_STATUS")
private Integer tagStatus;
@Column(name = "LIGHT_MODE")
@ApiParam("亮灯状态")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_LIGHT_MODE")
private Integer lightMode;
@Column(name = "LIGHT_COLOR")
@ApiParam("亮灯颜色")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_LIGHT_COLOR")
private Integer lightColor;
@Column(name = "IS_BUZZING")
@ApiParam("是否蜂鸣")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_IS_BUZZING")
private Integer isBuzzing;
@Column(name = "MUSIC_TYPE")
@ApiParam("音乐类型")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "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;
}

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

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.ptl.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.ptl.bean.PtlActor;
import cn.estsh.i3plus.pojo.ptl.bean.PtlArea;
import org.springframework.stereotype.Repository;
/**
* @author adair.song
* @date 2020/2/25 11:19
* @desc
*/
@Repository
public interface PtlAreaRepository extends BaseRepository<PtlArea, Long> {
}

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

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.ptl.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.ptl.bean.PtlAreaSectionTask;
import cn.estsh.i3plus.pojo.ptl.bean.PtlAreaTask;
/**
* @Description : 区段亮灯任务
* @author : jessica.chen
* @date : 2020-02-26 13:49
* @desc
*/
public interface PtlAreaSectionTaskRepository extends BaseRepository<PtlAreaSectionTask, Long> {
}

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.ptl.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.ptl.bean.PtlAreaTask;
/**
* @Description :
* @Reference :
* @Author : joke
* @CreateDate : 2020-02-25 11:16 下午
* @Modify:
**/
public interface PtlAreaTaskRepository extends BaseRepository<PtlAreaTask, Long> {
}

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

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.ptl.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.ptl.bean.PtlAreaTaskSeq;
/**
* @Description :
* @Reference :
* @Author : joke
* @CreateDate : 2020-02-25 11:18 下午
* @Modify:
**/
public interface PtlAreaTaskSeqRepository extends BaseRepository<PtlAreaTaskSeq, Long> {
}

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

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.ptl.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.ptl.bean.PtlArea;
import cn.estsh.i3plus.pojo.ptl.bean.PtlBom;
import org.springframework.stereotype.Repository;
/**
* @author adair.song
* @date 2020/2/25 11:19
* @desc
*/
@Repository
public interface PtlBomRepository extends BaseRepository<PtlBom, Long> {
}

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

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.ptl.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.ptl.bean.PtlActionModule;
import cn.estsh.i3plus.pojo.ptl.bean.PtlMainTask;
/**
* @author jessica.chen
* @date 2020/2/27 14:41
* @desc
*/
public interface PtlMainTaskRepository extends BaseRepository<PtlMainTask, Long> {
}

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

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.ptl.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.ptl.bean.PtlArea;
import cn.estsh.i3plus.pojo.ptl.bean.PtlPart;
import org.springframework.stereotype.Repository;
/**
* @author adair.song
* @date 2020/2/25 11:19
* @desc
*/
@Repository
public interface PtlPartRepository extends BaseRepository<PtlPart, Long> {
}

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

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.ptl.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.ptl.bean.PtlBom;
import cn.estsh.i3plus.pojo.ptl.bean.PtlSection;
import org.springframework.stereotype.Repository;
/**
* @author adair.song
* @date 2020/2/25 11:19
* @desc
*/
@Repository
public interface PtlSectionRepository extends BaseRepository<PtlSection, Long> {
}

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

@ -75,4 +75,8 @@ public class WmsSnOperateRecord extends BaseBean {
@AnnoOutputColumn(refClass = WmsEnumUtil.SN_OPERATE_TYPE.class, refForeignKey = "value", value = "description")
private Integer operateType;
@Column(name = "ref_sn")
@ApiParam(value = "关联二维码")
private String refSN;
}

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

@ -295,6 +295,14 @@ public class WmsStockSn extends BaseBean {
private String parentReturnPart;
@Transient
@ApiParam("保质期开始时间")
private String qualityDateTimeStart;
@Transient
@ApiParam("保质期结束时间")
private String qualityDateTimeEnd;
@Transient
@ApiParam(value = "预计完成时间")
private String planCompleteTime;

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

@ -1301,6 +1301,8 @@ public class WmsHqlPack {
DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getCustSn(), "custSn", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result);
DdlPreparedPack.timeBuilder(wmsStockSn.getQualityDateTimeStart(),
wmsStockSn.getQualityDateTimeEnd(), "qualityDate", result, false);
if (wmsStockSn.getIsValid() != null) {
DdlPreparedPack.getNumEqualPack(wmsStockSn.getIsValid(), "isValid", result);
}

Write Preview
Loading…
Cancel
Save