From f8d4e7f1fd6136372ea7b5752f26fe4a77ae9706 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 28 Feb 2020 11:52:09 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90PTL=5F=E6=A0=87=E7=AD=BE=E6=89=93?= =?UTF-8?q?=E5=8D=B0pojo=E6=96=B0=E5=A2=9E=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 123 +++++++++++++++++++++ .../i3plus/pojo/ptl/bean/PtlMainTaskDetail.java | 4 + .../i3plus/pojo/ptl/bean/PtlPrinterConfigure.java | 59 ++++++++++ .../i3plus/pojo/ptl/bean/PtlPrintingQueue.java | 55 +++++++++ .../repository/PtlMainTaskDetailRepository.java | 16 +++ .../repository/PtlPrinterConfigureRepository.java | 16 +++ .../ptl/repository/PtlPrintingQueueRepository.java | 16 +++ 7 files changed, 289 insertions(+) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrinterConfigure.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrintingQueue.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlMainTaskDetailRepository.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPrinterConfigureRepository.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPrintingQueueRepository.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 d9de4d0..e3c5ffc 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 @@ -1010,4 +1010,127 @@ public class PtlPcnEnumUtil { } } + /** + * PTL_主任务明细物料种类 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MAIN_TASK_DETAIL_PART_CATEGORY { + DOOR_LOCK_PART_NO(10, "DOOR_LOCK_PART_NO", "门锁零件号"); + + private int value; + private String code; + private String description; + + MAIN_TASK_DETAIL_PART_CATEGORY(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); + } + } + + /** + * 打印类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRINT_TYPE { + PART_NO(10, "PART_NO"); + + private int value; + private String description; + + PRINT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + 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; + } + } + + /** + * 打印状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ETC_PRINT_STATUS { + NOT_HIT(10, "未打"), + ALREADY_HIT(20, "已打"); + + private int value; + private String description; + + ETC_PRINT_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + 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; + } + } + } 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 index e532265..ba3146c 100644 --- 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 @@ -45,4 +45,8 @@ public class PtlMainTaskDetail extends BaseBean implements Serializable { @ApiParam("数量") private Integer qty; + @Column(name = "PART_CATEGORY") + @ApiParam("物料种类") + private Integer partCategory; + } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrinterConfigure.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrinterConfigure.java new file mode 100644 index 0000000..8d6bb6b --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrinterConfigure.java @@ -0,0 +1,59 @@ +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; + +/** + * @Description : 打印机配置表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2019-09-26 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="PTL_PRINTER_CONFIGURE") +@Api("打印机配置表") +public class PtlPrinterConfigure extends BaseBean{ + + private static final long serialVersionUID = 1234639813072592779L; + @Column(name="PRINTER_NO") + @ApiParam("打印机编号") + private String printerNo; + + @Column(name="PRINTER_NAME") + @ApiParam("打印机名称") + private String printerName; + + @Column(name="IP") + @ApiParam("IP") + private String ip; + + @Column(name="PORT") + @ApiParam("端口") + private Integer port; + + @Column(name="OBJECT_DESCRIPTION") + @ApiParam(value ="描述") + private String objectDescription; + + @Column(name="POSITION") + @ApiParam("位置") + private String position; + + @Column(name="TYPE") + @ApiParam("类型") + private Integer type; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrintingQueue.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrintingQueue.java new file mode 100644 index 0000000..6055b3d --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPrintingQueue.java @@ -0,0 +1,55 @@ +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; + +/** + * @Description : 待打印队列表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2019-09-27 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="PTL_PRINTING_QUEUE") +@Api("待打印队列表") +public class PtlPrintingQueue extends BaseBean{ + + private static final long serialVersionUID = 1111639813072592779L; + @Column(name="PRINT_IDENTIFICATION") + @ApiParam("打印标识") + private String printIdentification; + + @Column(name="PRINT_TYPE") + @ApiParam("打印类型") + private Integer printType; + + @Column(name="PRINT_NO") + @ApiParam("打印机编号") + private String printNo; + + @Column(name="PRINT_MUMBER") + @ApiParam("打印机张数") + private Integer printNumber = 1; + + @Column(name="TEMPLATE_NO") + @ApiParam("模板编号") + private String templateNo; + + @Column(name="PRINT_STATUS") + @ApiParam("打印状态") + private Integer printStatus; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlMainTaskDetailRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlMainTaskDetailRepository.java new file mode 100644 index 0000000..e7b4706 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlMainTaskDetailRepository.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.PtlMainTaskDetail; +import cn.estsh.i3plus.pojo.ptl.bean.PtlPrinterConfigure; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlMainTaskDetailRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPrinterConfigureRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPrinterConfigureRepository.java new file mode 100644 index 0000000..ecf2db7 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPrinterConfigureRepository.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.PtlPrinterConfigure; +import cn.estsh.i3plus.pojo.ptl.bean.PtlPrintingQueue; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlPrinterConfigureRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPrintingQueueRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPrintingQueueRepository.java new file mode 100644 index 0000000..4d6748e --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPrintingQueueRepository.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.PtlPrintingQueue; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlPrintingQueueRepository extends BaseRepository { + +}