From 40094365ce73d79021d0ae4e0b915abf5e80b525 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 26 Feb 2020 16:22:32 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90PTL=5F=E5=8C=BA=E6=AE=B5=E4=BA=AE?= =?UTF-8?q?=E7=81=AF=E4=BB=BB=E5=8A=A1=E6=98=8E=E7=BB=86=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 121 +++++++++++++++++++++ .../pojo/ptl/bean/PtlAreaSectionTaskDetail.java | 2 +- .../repository/PtlAreaSectionTaskRepository.java | 17 +++ .../pojo/ptl/repository/PtlAreaTaskRepository.java | 17 +++ 4 files changed, 156 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaSectionTaskRepository.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaTaskRepository.java 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..e67c390 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; } @@ -722,4 +732,115 @@ public class PtlPcnEnumUtil { } } + /** + * 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); + } + } + } 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/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..deb55b5 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaTaskRepository.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.PtlActor; +import cn.estsh.i3plus.pojo.ptl.bean.PtlAreaTask; + +/** + * @Description : 区域亮灯任务 + * @author : jessica.chen + * @date : 2020-02-26 13:49 + * @desc + */ + +public interface PtlAreaTaskRepository extends BaseRepository { + +}