yun-zuoyi
joke 5 years ago
commit d42b7ebbb6

@ -11,6 +11,404 @@ import org.springframework.util.StringUtils;
public class PtlPcnEnumUtil {
/**
* LED
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TAG_LED_CONTENT_CMD {
TAG_0("30", "0", "0"),
TAG_1("31", "1", "1"),
TAG_2("32", "2", "2"),
TAG_3("33", "3", "3"),
TAG_4("34", "4", "4"),
TAG_5("35", "5", "5"),
TAG_6("36", "6", "6"),
TAG_7("37", "7", "7"),
TAG_8("38", "8", "8"),
TAG_9("39", "9", "9"),
TAG_A("41", "A", "A"),
TAG_b("62", "b", "b"),
TAG_C("43", "C", "C"),
TAG_d("64", "d", "d"),
TAG_E("45", "E", "E"),
TAG_F("46", "F", "F"),
TAG_c("63", "c", "c"),
TAG_H("48", "H", "H"),
TAG_L("4C", "L", "L"),
TAG_SPACE("20", " ", " "),
TAG_n("6E", "n", "n"),
TAG_o("6F", "o", "o"),
TAG_h("68", "h", "h"),
TAG_r("72", "r", "r"),
TAG_u("75", "u", "u"),
TAG_i("69", "i", "i"),
TAG_y("79", "y", "y"),
TAG_t("74", "t", "t"),
TAG_q("71", "q", "q"),
TAG_G("47", "G", "G"),
TAG_S("53", "S", "S"),
TAG_l("6C", "l", "l"),
TAG_O("4F", "O", "O"),
TAG_SQUARE_BRACKET_LEFT("5B", "[", "["),
TAG_SQUARE_BRACKET_RIGHT("5D", "]", "]"),
TAG_P("50", "P", "P"),
TAG_U("55", "U", "U"),
TAG_HYPHEN("2D", "-", "-");
private String code;
private String value;
private String description;
TAG_LED_CONTENT_CMD(String code, String value, String description) {
this.code = code;
this.value = value;
this.description = description;
}
public String getCode() {
return code;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfCode(String value) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(value)) {
tmp = values()[i].code;
}
}
return tmp;
}
}
/**
* LED
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TAG_LED_POINT_CMD {
TAG_POINT_0("00", "000000", "000000"),
TAG_POINT_1("01", "000000.", "000000."),
TAG_POINT_2("02", "00000.0", "00000.0"),
TAG_POINT_12("03", "00000.0.", "00000.0."),
TAG_POINT_3("04", "0000.00", "0000.00"),
TAG_POINT_13("05", "0000.00.", "0000.00."),
TAG_POINT_23("06", "0000.0.0", "0000.0.0"),
TAG_POINT_123("07", "0000.0.0.", "0000.0.0."),
TAG_POINT_4("08", "000.000", "000.000"),
TAG_POINT_14("09", "000.000.", "000.000."),
TAG_POINT_24("0A", "000.00.0", "000.00.0"),
TAG_POINT_124("0B", "000.00.0.", "000.00.0."),
TAG_POINT_34("0C", "000.0.00", "000.0.00"),
TAG_POINT_134("0D", "000.0.00.", "000.0.00."),
TAG_POINT_234("0E", "000.0.0.0", "000.0.0.0"),
TAG_POINT_1234("0F", "000.0.0.0.", "000.0.0.0."),
TAG_POINT_5("10", "00.0000", "00.0000"),
TAG_POINT_15("11", "00.0000.", "00.0000."),
TAG_POINT_25("12", "00.000.0", "00.000.0"),
TAG_POINT_125("13", "00.000.0.", "00.000.0."),
TAG_POINT_35("14", "00.00.00", "00.00.00"),
TAG_POINT_135("15", "00.00.00.", "00.00.00."),
TAG_POINT_235("16", "00.00.0.0", "00.00.0.0"),
TAG_POINT_1235("17", "00.00.0.0.", "00.00.0.0."),
TAG_POINT_45("18", "00.0.000", "00.0.000"),
TAG_POINT_145("19", "00.0.000.", "00.0.000."),
TAG_POINT_245("1A", "00.0.00.0", "00.0.00.0"),
TAG_POINT_1245("1B", "00.0.00.0.", "00.0.00.0."),
TAG_POINT_345("1C", "00.0.0.00", "00.0.0.00"),
TAG_POINT_1345("1D", "00.0.0.00.", "00.0.0.00."),
TAG_POINT_2345("1E", "00.0.0.0.0", "00.0.0.0.0"),
TAG_POINT_12345("1F", "00.0.0.0.0.", "00.0.0.0.0."),
TAG_POINT_6("20", "0.00000", "0.00000"),
TAG_POINT_16("21", "0.00000.", "0.00000."),
TAG_POINT_26("22", "0.0000.0", "0.0000.0"),
TAG_POINT_126("23", "0.0000.0.", "0.0000.0."),
TAG_POINT_36("24", "0.000.00", "0.000.00"),
TAG_POINT_136("25", "0.000.00.", "0.000.00."),
TAG_POINT_236("26", "0.000.0.0", "0.000.0.0"),
TAG_POINT_1236("27", "0.000.0.0.", "0.000.0.0."),
TAG_POINT_46("28", "0.00.000", "0.00.000"),
TAG_POINT_146("29", "0.00.000.", "0.00.000."),
TAG_POINT_246("2A", "0.00.00.0", "0.00.00.0"),
TAG_POINT_1246("2B", "0.00.00.0.", "0.00.00.0."),
TAG_POINT_346("2C", "0.00.0.00", "0.00.0.00"),
TAG_POINT_1346("2D", "0.00.0.00.", "0.00.0.00."),
TAG_POINT_2346("2E", "0.00.0.0.0", "0.00.0.0.0"),
TAG_POINT_12346("2F", "0.00.0.0.0.", "0.00.0.0.0."),
TAG_POINT_56("30", "0.0.0000", "0.0.0000"),
TAG_POINT_156("31", "0.0.0000.", "0.0.0000."),
TAG_POINT_256("32", "0.0.000.0", "0.0.000.0"),
TAG_POINT_1256("33", "0.0.000.0.", "0.0.000.0."),
TAG_POINT_356("34", "0.0.00.00", "0.0.00.00"),
TAG_POINT_1356("35", "0.0.00.00.", "0.0.00.00."),
TAG_POINT_2356("36", "0.0.00.0.0", "0.0.00.0.0"),
TAG_POINT_12356("37", "0.0.00.0.0.", "0.0.00.0.0."),
TAG_POINT_456("38", "0.0.0.000", "0.0.0.000"),
TAG_POINT_1456("39", "0.0.0.000.", "0.0.0.000."),
TAG_POINT_2456("3A", "0.0.0.00.0", "0.0.0.00.0"),
TAG_POINT_12456("3B", "0.0.0.00.0.", "0.0.0.00.0."),
TAG_POINT_3456("3C", "0.0.0.0.00", "0.0.0.0.00"),
TAG_POINT_13456("3D", "0.0.0.0.00.", "0.0.0.0.00."),
TAG_POINT_23456("3E", "0.0.0.0.0.0", "0.0.0.0.0.0"),
TAG_POINT_123456("3F", "0.0.0.0.0.0.", "0.0.0.0.0.0.");
private String code;
private String value;
private String description;
TAG_LED_POINT_CMD(String code, String value, String description) {
this.code = code;
this.value = value;
this.description = description;
}
public String getCode() {
return code;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfCode(String value) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(value)) {
tmp = values()[i].code;
}
}
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TAG_CONTROL_CHILD_CMD {
CHILD_CMD_00H("00", "在标签上显示字母数字(备注)"),
CHILD_CMD_01H("01", "关闭标签所有字符/清除缓冲区中的所有显示"),
CHILD_CMD_02H("02", "打开灯光指示器"),
CHILD_CMD_03H("03", "关闭灯光指示器"),
CHILD_CMD_04H("04", "蜂鸣器打开"),
CHILD_CMD_05H("05", "蜂鸣器关闭"),
CHILD_CMD_06H("06", "按钮返回确认消息"),
CHILD_CMD_07H("07", "按下按钮返回缺货信息"),
CHILD_CMD_08H("08", "设置最大地址轮询值"),
CHILD_CMD_09H("09", "连接的现场设备的返回状态"),
CHILD_CMD_0AH("0A", "现场设备超时"),
CHILD_CMD_0BH("0B", "查询设备故障,返回设备故障"),
CHILD_CMD_0CH("0C", "设备无法执行命令"),
CHILD_CMD_0DH("0D", "返回按钮锁定消息 (只有在从本机发送消息到设备后才激活)"),
CHILD_CMD_FCH("FC", "设备重置 OK获取设备详细信息返回设备的详细信息(与重置 OK 相同)"),
CHILD_CMD_0FH("0F", "返回库存模式下的缺货量"),
CHILD_CMD_10H("10", "在标签上闪烁字母数字"),
CHILD_CMD_11H("11", "指示灯闪烁"),
CHILD_CMD_12H("12", "设置闪烁时间间隔"),
CHILD_CMD_13H("13", "显示标签地址"),
CHILD_CMD_14H("14", "重置设备"),
CHILD_CMD_15H("15", "禁用缺货按钮"),
CHILD_CMD_16H("16", "启用缺货按钮"),
CHILD_CMD_17H("17", "模拟确认按钮"),
CHILD_CMD_18H("18", "模拟缺货按键"),
CHILD_CMD_19H("19", "切换为盘点模式"),
CHILD_CMD_1AH("1A", "切换为拣货模式"),
CHILD_CMD_1BH("1B", "禁用确认键"),
CHILD_CMD_1CH("1C", "启用确认和缺货按钮"),
CHILD_CMD_1EH("1E", "设置计数位"),
CHILD_CMD_1FH("1F", "设置标签多个配置"),
CHILD_CMD_3AH("3A", "设置设备地址"),
CHILD_CMD_64H("64", "设备返回"),
CHILD_CMD_FAH("FA", "获取设备的 F/W 模型信息,返回设备的 F/W 模型信息"),
CHILD_CMD_F7H("F7", "获取/启用/禁用警报自动蜂鸣器功能,获取/启用/禁用报警自动报告模式");
private String code;
private String description;
TAG_CONTROL_CHILD_CMD(String code, String description) {
this.code = code;
this.description = description;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TAG_LIGHT_COLOR_CMD {
TAG_LIGHT_COLOR_RED("00", "红"),
TAG_LIGHT_COLOR_GREEN("01", "绿"),
TAG_LIGHT_COLOR_ORANGE("02", "橙"),
TAG_LIGHT_COLOR_BLUE("03", "蓝"),
TAG_LIGHT_COLOR_PINK_RED("04", "粉红"),
TAG_LIGHT_COLOR_BLUE_GREEN("05", "蓝绿");
private String code;
private String description;
TAG_LIGHT_COLOR_CMD(String code, String description) {
this.code = code;
this.description = description;
}
public static TAG_LIGHT_COLOR_CMD getByValue(String code) {
for (TAG_LIGHT_COLOR_CMD tagLightColorCmd : values()) {
if (tagLightColorCmd.getCode() == code) {
return tagLightColorCmd;
}
}
return null;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TAG_LIGHT_TYPE {
TAG_LIGHT_TYPE_LIGHT(10, "常亮"),
TAG_LIGHT_TYPE_TWINKLE(20, "闪烁");
private int value;
private String description;
TAG_LIGHT_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum FINISH_TAG_LIGHT_MUSIC_CMD {
FINISH_TAG_LIGHT_MUSIC_00H("00", "Jingle bells"),
FINISH_TAG_LIGHT_MUSIC_01H("01", "Carmen"),
FINISH_TAG_LIGHT_MUSIC_02H("02", "Happy Chinese new year"),
FINISH_TAG_LIGHT_MUSIC_03H("03", "Edelweiss"),
FINISH_TAG_LIGHT_MUSIC_04H("04", "Going home"),
FINISH_TAG_LIGHT_MUSIC_05H("05", "PAPALA"),
FINISH_TAG_LIGHT_MUSIC_06H("06", "Classical"),
FINISH_TAG_LIGHT_MUSIC_07H("07", "Listen to the rhythm of the falling rain"),
FINISH_TAG_LIGHT_MUSIC_08H("08", "Rock and roll"),
FINISH_TAG_LIGHT_MUSIC_09H("09", "Happy birthday"),
FINISH_TAG_LIGHT_MUSIC_0AH("0A", "Do Re Me"),
FINISH_TAG_LIGHT_MUSIC_0BH("0B", "Strauss");
private String code;
private String description;
FINISH_TAG_LIGHT_MUSIC_CMD(String code, String description) {
this.code = code;
this.description = description;
}
public static FINISH_TAG_LIGHT_MUSIC_CMD getByValue(String code) {
for (FINISH_TAG_LIGHT_MUSIC_CMD finishTagLightMusicCmd : values()) {
if (finishTagLightMusicCmd.getCode() == code) {
return finishTagLightMusicCmd;
}
}
return null;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum FINISH_TAG_LIGHT_VOLUME_CMD {
FINISH_TAG_LIGHT_VOLUME_00H("00", "0"),
FINISH_TAG_LIGHT_VOLUME_01H("01", "1"),
FINISH_TAG_LIGHT_VOLUME_02H("02", "2"),
FINISH_TAG_LIGHT_VOLUME_03H("03", "3"),
FINISH_TAG_LIGHT_VOLUME_04H("04", "4"),
FINISH_TAG_LIGHT_VOLUME_05H("05", "5"),
FINISH_TAG_LIGHT_VOLUME_06H("06", "6"),
FINISH_TAG_LIGHT_VOLUME_07H("07", "7"),
FINISH_TAG_LIGHT_VOLUME_08H("08", "8"),
FINISH_TAG_LIGHT_VOLUME_09H("09", "9"),
FINISH_TAG_LIGHT_VOLUME_0AH("0A", "10"),
FINISH_TAG_LIGHT_VOLUME_0BH("0B", "11"),
FINISH_TAG_LIGHT_VOLUME_0CH("0C", "12"),
FINISH_TAG_LIGHT_VOLUME_0DH("0D", "13"),
FINISH_TAG_LIGHT_VOLUME_0EH("0E", "14"),
FINISH_TAG_LIGHT_VOLUME_0FH("0F", "15");
private String code;
private String description;
FINISH_TAG_LIGHT_VOLUME_CMD(String code, String description) {
this.code = code;
this.description = description;
}
public static FINISH_TAG_LIGHT_VOLUME_CMD getByValue(String code) {
for (FINISH_TAG_LIGHT_VOLUME_CMD finishTagLightVolumeCmd : values()) {
if (finishTagLightVolumeCmd.getCode() == code) {
return finishTagLightVolumeCmd;
}
}
return null;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum RouteEvent {
TRIGGER(10, "trigger", "触发"),
@ -295,4 +693,33 @@ public class PtlPcnEnumUtil {
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum StatusType {
START(10, "START", "开始状态"),
FINISH(20, "FINISH", "完成状态"),
TERMINATE(30, "TERMINATE", "中断状态");
private int value;
private String code;
private String description;
StatusType(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;
}
}
}

@ -45,5 +45,5 @@ public class MesNumberSerialno extends BaseBean implements Serializable {
@Version
@Column(name = "LOCK_VERSION")
@ApiParam(value = "乐观锁", example = "1")
public Integer lockVersion;
public transient Integer lockVersion;
}

@ -0,0 +1,59 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
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.*;
import java.io.Serializable;
import java.util.List;
/**
* @Author: Wynne.Lu
* @CreateDate: 2020/02/15 1:45 PM
* @Description:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_SYNC_DEAD_LETTER", indexes = {
@Index(name = "idx_object_code_pcn", columnList = "OBJECT_CODE"),
@Index(name = "idx_object_code_pcn", columnList = "PCN_CODE")
})
@Api("数据同步死信")
public class MesSyncDeadLetter extends BaseBean implements Serializable {
private static final long serialVersionUID = 1151025992437433734L;
@Column(name = "OBJECT_CODE")
@ApiParam("对象代码")
private String objectCode;
@Column(name = "SYNC_TYPE")
@ApiParam("同步类型")
private Integer syncType;
@Column(name = "PCN_CODE")
@ApiParam("pcn代码")
private String pcnCode;
@Lob
@Column(name = "EX_MSG")
@ApiParam("同步数据")
private String exMsg;
@Lob
@Column(name = "DATA")
@ApiParam("同步数据")
private String data;
}

@ -0,0 +1,12 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesSyncDeadLetter;
/**
* @author Wynne.Lu
* @date 2020/2/18 09:19
* @desc
*/
public interface MesSyncDeadLetterRepository extends BaseRepository<MesSyncDeadLetter, Long> {
}

@ -1,7 +1,6 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -30,6 +29,7 @@ import javax.persistence.Table;
public class SysTask extends BaseBean {
private static final long serialVersionUID = -4462661508105857312L;
@Column(name="NAME")
@ApiParam(value ="名称")
private String name;

@ -718,6 +718,7 @@ public class CoreHqlPack {
HqlPack.getStringEqualPack(localeResource.getLanguageCode(),"languageCode",result);
HqlPack.getStringEqualPack(localeResource.getResourceKey(),"resourceKey",result);
HqlPack.getNumEqualPack(localeResource.getSoftType(),"softType",result);
HqlPack.getNumNOEqualPack(localeResource.getId(),"id",result);
// 添加默认排序

@ -70,9 +70,9 @@ public class PtlRouteStatus extends BaseBean implements Serializable {
@ApiParam("离开状态调用")
private Long outAmgId;
@Column(name = "SEQ")
@ApiParam("流程状态顺序")
private Integer seq;
@Column(name = "STATUS_TYPE")
@ApiParam("状态类型")
private Integer statusType;
}

@ -111,6 +111,7 @@ public class WmsDocMovementMaster extends BaseBean {
@ApiParam(value = "客户单号")
private String custOrderNo;
@Transient
private List<WmsDocMovementDetails> movementDetailsList;
@ -160,6 +161,15 @@ public class WmsDocMovementMaster extends BaseBean {
@ApiParam(value = "计划时间")
private String assignPlanTime;
@Column(name = "TAG")
@ApiParam(value = "标签")
private String tag;
@Column(name = "IS_SINGLE_STEP")
@ApiParam(value = "一步法/两步法")
@AnnoOutputColumn(refClass = WmsEnumUtil.STEP.class, refForeignKey = "value", value = "description")
private Integer isSingleStep;
@Transient
@ApiParam(value = "发运单号")
private String shipOrderNo;
@ -180,10 +190,6 @@ public class WmsDocMovementMaster extends BaseBean {
@Transient
public String title;
@Column(name = "TAG")
@ApiParam(value = "标签")
private String tag;
@Transient
@ApiParam("物料编号组")
public String[] partNos;

@ -247,6 +247,11 @@ public class WmsPart extends BaseBean {
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double cycleRquestQty = 0d;
@Column(name = "CURING_TIME")
@ApiParam(value = "固化时间", example = "0")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double curingTime = 0d;
public int getIqcVal(){
return this.iqc == null ? 0 : this.iqc.intValue();
}
@ -274,6 +279,10 @@ public class WmsPart extends BaseBean {
return this.cycleRquestQty == null? 0d:this.cycleRquestQty.doubleValue();
}
public Double getCuringTime() {
return this.curingTime == null? 0d:this.curingTime.doubleValue();
}
public WmsPart(String partNo, String partName, Double maxQty, Double minQty, Double cqty, String partType) {
this.partNo = partNo;

@ -96,6 +96,7 @@ public class WmsRoutingRule extends BaseBean {
@Column(name = "MODE_CODE")
@ApiParam(value = "处理模式(10:生成任务,20:自动操作,30手工操作40:自动操作 无交易)" , example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.ROUTING_RULE_MODE.class, refForeignKey = "value", value = "description")
private Integer modeCode;
@Column(name = "DELAY_TIME")

Loading…
Cancel
Save