diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index c5da101..d9de4d0 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -482,6 +482,16 @@ public class PtlPcnEnumUtil { 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; @@ -722,4 +738,276 @@ public class PtlPcnEnumUtil { } } + @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; + } + + 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 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); + } + } + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java index a82b8d4..22810be 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java @@ -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; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java index 01015d5..5c98174 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java @@ -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; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java index 60f05df..38103b1 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java @@ -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("亮灯方式") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java index ea940a6..6aec23d 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java @@ -35,7 +35,7 @@ public class PtlBom extends BaseBean implements Serializable { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partNo; - @Column(name = "PART_NAME", columnDefinition = "varchar(20) default '1'", nullable = false) + @Column(name = "PART_NAME", columnDefinition = "varchar(255) default '1'", nullable = false) @ApiParam("父物料描述") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partName; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java new file mode 100644 index 0000000..e532265 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java @@ -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; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaSectionTaskRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaSectionTaskRepository.java new file mode 100644 index 0000000..35d74c9 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaSectionTaskRepository.java @@ -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 { + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaTaskRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaTaskRepository.java new file mode 100644 index 0000000..8d649d8 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaTaskRepository.java @@ -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 { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaTaskSeqRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaTaskSeqRepository.java new file mode 100644 index 0000000..dfee536 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaTaskSeqRepository.java @@ -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 { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlMainTaskRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlMainTaskRepository.java new file mode 100644 index 0000000..3d9b98d --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlMainTaskRepository.java @@ -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 { + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java index de87da0..456348c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java @@ -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; + }