From edfc78995b5c851a37bd6122b17dfbf0249e407d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 27 Sep 2019 14:48:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=9C=BA=E9=85=8D=E7=BD=AE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 44b70e6..c584ac5 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -1866,7 +1866,8 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum COMMON_SN { - PO_SN("PO_SN", "PO条码"); + PO_SN("PO_SN", "PO条码"), + VDA_SN("VDA_SN", "VDA条码"); private String code; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 20705ab..c63c5fc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -147,6 +147,22 @@ public class WmsPart extends BaseBean { @ApiParam("保质期天数") private Integer qualityDays; + @Column(name = "IS_REPORT_PARTNO") + @ApiParam("是否报工零件") + private Integer isReportPartNo; + + @Column(name = "REPORT_LOCATE_NO") + @ApiParam("报工库位") + private String reportLocateNo; + + @Column(name = "REPORT_ZONE_NO") + @ApiParam("报工存储区") + private String reportZoneNo; + + @Column(name = "PRODUCT_LINES") + @ApiParam("报工产线") + private String productLines; + @Transient @ApiParam("总数量") private Double qty; From 3ba6508b0c847884e73e398d3dde7b7b9b056e30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 27 Sep 2019 14:50:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=9C=BA=E9=85=8D=E7=BD=AE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsPrinterConfigure.java | 59 ++++++++++++++++++++++ .../repository/WmsPrinterConfigureRepository.java | 15 ++++++ 2 files changed, 74 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrinterConfigure.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPrinterConfigureRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrinterConfigure.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrinterConfigure.java new file mode 100644 index 0000000..7c8bf61 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrinterConfigure.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.wms.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="WMS_PRINTER_CONFIGURE") +@Api("打印机配置表") +public class WmsPrinterConfigure 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-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPrinterConfigureRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPrinterConfigureRepository.java new file mode 100644 index 0000000..83401e5 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPrinterConfigureRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionLogData; +import cn.estsh.i3plus.pojo.wms.bean.WmsPrinterConfigure; + +/** + * @Description : 打印机配置 + * @Reference : + * @Author : jessica.chen + * @Date : 2019-09-26 12:03:00 + * @Modify : + **/ +public interface WmsPrinterConfigureRepository extends BaseRepository { +} From 26684524f1acb5dae1d21779bc45a17018b287c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 27 Sep 2019 16:37:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=92=8C=E7=94=9F=E4=BA=A7=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=BB=84=E4=BB=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 69 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsPrintingQueue.java | 55 +++++++++++++++++ .../wms/repository/WmsPrintingQueueRepository.java | 17 ++++++ 3 files changed, 141 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPrintingQueueRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 5cc62e7..7d6be83 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -3449,4 +3449,73 @@ public class WmsEnumUtil { } } + /** + * 打印类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRINT_TYPE { + SN(10, "SN"); + + 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; + } + } + } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java new file mode 100644 index 0000000..9aac6f4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.wms.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="WMS_PRINTING_QUEUE") +@Api("待打印队列表") +public class WmsPrintingQueue 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; + + @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-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPrintingQueueRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPrintingQueueRepository.java new file mode 100644 index 0000000..b63a0f8 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPrintingQueueRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.BasVendor; +import cn.estsh.i3plus.pojo.wms.bean.WmsPrintingQueue; +import org.springframework.stereotype.Repository; + +/** + * @Description :待打印配置表 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2019-09-27 14:49 + * @Modify: + **/ +@Repository +public interface WmsPrintingQueueRepository extends BaseRepository { +}