From 1ec56edcdc4536957bc49120e96c8bdb34b0730d Mon Sep 17 00:00:00 2001 From: luweihao Date: Mon, 17 Feb 2020 21:43:22 +0800 Subject: [PATCH 1/8] =?UTF-8?q?task=20`1295`=20mes=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 29 ++++++++++++++++++++++ .../i3plus/pojo/ptl/pcn/bean/PtlRouteStatus.java | 6 ++--- 2 files changed, 32 insertions(+), 3 deletions(-) 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 109441d..547c005 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 @@ -295,4 +295,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; + } + } + } diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlRouteStatus.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlRouteStatus.java index ba83441..6ae00b1 100644 --- a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlRouteStatus.java +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PtlRouteStatus.java @@ -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; } From 1a2f00afc3e6281c48d3b22273b32739820b5ce6 Mon Sep 17 00:00:00 2001 From: luweihao Date: Mon, 17 Feb 2020 21:44:33 +0800 Subject: [PATCH 2/8] =?UTF-8?q?task=20`1408`=20=E6=B7=BB=E5=8A=A0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=90=8C=E6=AD=A5=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesSyncDeadLetter.java | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java new file mode 100644 index 0000000..986ee2c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java @@ -0,0 +1,54 @@ +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 = "DATA") + @ApiParam("同步数据") + private String data; + + +} From e38839db6cc17a696d9c88648219ccd3cf7f99af Mon Sep 17 00:00:00 2001 From: luweihao Date: Tue, 18 Feb 2020 13:59:51 +0800 Subject: [PATCH 3/8] =?UTF-8?q?task=20`1408`=20=E6=95=B0=E6=8D=AE=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/repository/MesSyncDeadLetterRepository.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSyncDeadLetterRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSyncDeadLetterRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSyncDeadLetterRepository.java new file mode 100644 index 0000000..3e07f6b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSyncDeadLetterRepository.java @@ -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 { +} From 759fda55b93c7aad209d8de0e9f13e2e5d74b95c Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 18 Feb 2020 20:08:05 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E3=80=90=207527=201.=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E5=85=A5=E5=BA=93=EF=BC=88=E6=8E=A8=E8=8D=90=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E5=85=A5=E5=BA=93=EF=BC=89=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=8A=A0=E5=AF=86=E7=A0=81=E9=94=99=EF=BC=8C=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E6=9C=89=E9=97=AE=E9=A2=98=EF=BC=8C2.=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E6=89=AB=E6=8F=8F=E5=BA=93=E4=BD=8D=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E6=9D=A1=E7=A0=81=E6=9F=90=E9=A1=B9=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E4=B8=8D=E7=AC=A6=E5=90=88=E5=85=A5=E5=BA=93=E8=A7=84?= =?UTF-8?q?=E8=8C=83=E5=88=99=E9=9C=80=E8=A6=81=E5=9B=9E=E5=88=B0=E8=AF=B7?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E6=9D=A1=E7=A0=81=E9=82=A3=E4=B8=80=E6=AD=A5?= =?UTF-8?q?=E3=80=82=20=E3=80=91bug7527?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index dbd5e1f..8a1bb3a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -111,6 +111,10 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "客户单号") private String custOrderNo; + @Column(name = "remark") + @ApiParam(value = "备注:一步法/两步法") + private String remark; + @Transient private List movementDetailsList; From 748ef11ccf62afeadb004ef63ad9d9401d2f8329 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 18 Feb 2020 22:03:50 +0800 Subject: [PATCH 5/8] =?UTF-8?q?ptl-pcn=E6=A0=87=E7=AD=BE=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=99=A8=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 398 +++++++++++++++++++++ 1 file changed, 398 insertions(+) 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 547c005..8ae1488 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 @@ -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", "触发"), From 37ee72adaf4debc67ad37a857dc3664f6beca0ac Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 19 Feb 2020 12:26:40 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E3=80=90=207523=20=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=8B=86=E7=AE=B1=E5=8A=9F=E8=83=BD=E8=BE=93=E5=85=A5=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E6=97=B6=EF=BC=8C=E6=AD=A4=E5=A4=84=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E2=80=9C=E6=89=AB=E6=8F=8F=E6=88=90=E5=8A=9F?= =?UTF-8?q?=EF=BC=8C=E8=AF=B7=E8=BE=93=E5=85=A5=E6=96=B0=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E2=80=9D=20=E3=80=91bug7523?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java index bb300a5..b2119ad 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java @@ -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") From 709db0b573677e8915ebb25c59218674ff660c53 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 19 Feb 2020 13:23:35 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E3=80=90=207526=20=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E5=8D=95=E6=8E=A5=E6=94=B6=E6=97=B6=EF=BC=8C=E5=9C=A8=E4=B8=BB?= =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E5=9C=A8=E8=AE=B2=E5=8D=95=E6=8D=AE=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=86=99=E5=85=A5=E6=95=B0=E6=8D=AE=E5=BA=93=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E8=AF=A5=E5=8D=95=E6=8D=AE=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E4=B8=AD=E5=8F=AA=E5=AD=98=E5=9C=A8=E4=B8=80=E6=AD=A5?= =?UTF-8?q?=E6=B3=95=E7=9A=84=E9=9B=B6=E4=BB=B6=E5=8F=B7=EF=BC=8C=E5=88=99?= =?UTF-8?q?=E8=AF=A5=E5=AD=97=E6=AE=B5=E9=9C=80=E8=A6=81=E5=9C=A8=E5=89=8D?= =?UTF-8?q?=E5=8F=B0=E6=98=BE=E7=A4=BA=E4=B8=BA=E4=B8=80=E6=AD=A5=E6=B3=95?= =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E5=AD=98=E5=9C=A8=E4=B8=A4=E6=AD=A5?= =?UTF-8?q?=E6=B3=95=E7=9A=84=E9=9B=B6=E4=BB=B6=E5=8F=B7=EF=BC=8C=E5=88=99?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=BA=E4=B8=A4=E6=AD=A5=E6=B3=95=E3=80=82?= =?UTF-8?q?=20=E3=80=91bug7526?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 8a1bb3a..74d1911 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -111,9 +111,6 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "客户单号") private String custOrderNo; - @Column(name = "remark") - @ApiParam(value = "备注:一步法/两步法") - private String remark; @Transient private List movementDetailsList; @@ -164,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; @@ -184,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; From 5eb7cf03edf3cd460cc4d1be484ea7a1ff1d5396 Mon Sep 17 00:00:00 2001 From: luweihao Date: Thu, 20 Feb 2020 16:10:58 +0800 Subject: [PATCH 8/8] =?UTF-8?q?task=20=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java index 3be0723..16436c6 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java @@ -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; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java index 986ee2c..3692f51 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java @@ -46,6 +46,11 @@ public class MesSyncDeadLetter extends BaseBean implements Serializable { private String pcnCode; @Lob + @Column(name = "EX_MSG") + @ApiParam("同步数据") + private String exMsg; + + @Lob @Column(name = "DATA") @ApiParam("同步数据") private String data;