From 92000801781b5dd87d786f36f192813657ba62d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 23 May 2019 16:32:19 +0800 Subject: [PATCH] =?UTF-8?q?MES-POJO=E6=B7=BB=E5=8A=A0=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=90=8D=E7=A7=B0=EF=BC=8C=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=90=8D=E7=A7=B0=E4=BD=9C=E4=B8=BA=E5=86=97?= =?UTF-8?q?=E4=BD=99=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 2 +- .../i3plus/pojo/mes/pcn/bean/MesQueueOrder.java | 17 ++++++++++ .../pojo/mes/pcn/bean/MesQueueOrderDetail.java | 9 ++++-- .../estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 4 +++ .../i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 9 ++++-- .../i3plus/pojo/mes/model/QueueOrderModel.java | 36 +++++++++++++++------- 6 files changed, 59 insertions(+), 18 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 8ffa732..09be175 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -352,7 +352,7 @@ public class MesEnumUtil { CREATE(10,"创建"), PROCESS(20,"加工"), - OFFLINE(30,"上线"), + OFFLINE(30,"下线"), INSTOCKED(40,"入库"), SHIPING(50,"发运"), CLOSE(90,"关闭"),; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java index 26675f7..1305c16 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description: @@ -39,6 +40,14 @@ public class MesQueueOrder extends BaseBean { @ApiParam("客户标识号") private String custFlagNo; + @Column(name="PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name="PROD_CFG_NAME_RDD") + @ApiParam("产品配置名称") + private String prodCfgNameRdd; + @Column(name="SEQ") @ApiParam("排序") private Double seq; @@ -59,6 +68,14 @@ public class MesQueueOrder extends BaseBean { @ApiParam("区域代码") private String areaCode; + @Transient + @ApiParam("起始车号") + private String custFlagNoStart; + + @Transient + @ApiParam("截至车号") + private String custFlagNoEnd; + public int getStatusVal() { return this.status == null ? 0 : this.status; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java index 91149c5..1aedff5 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java @@ -59,10 +59,13 @@ public class MesQueueOrderDetail extends BaseBean { @ApiParam("生产类型") private String workOrderType; - @Column(name="PRODUCE_CATEGORY") - @ApiParam("产品类型") - private String produceCategory; + @Column(name="PRODUCE_CATEGORY_CODE") + @ApiParam("产品类型代码") + private String produceCategoryCode; + @Column(name="PRODUCE_CATEGORY_NAME_RDD") + @ApiParam("产品类型名称") + private String produceCategoryNameRdd; public double getSeqVal() { return this.seq == null ? 0.0d : this.seq; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 4bb5af7..f18b844 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -48,6 +48,10 @@ public class MesQueueOrder extends BaseBean { @ApiParam("产品配置代码") private String prodCfgCode; + @Column(name="PROD_CFG_NAME_RDD") + @ApiParam("产品配置名称") + private String prodCfgNameRdd; + @Column(name="SEQ") @ApiParam("排序") private Double seq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 14bb9bb..d8ee647 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -59,10 +59,13 @@ public class MesQueueOrderDetail extends BaseBean { @ApiParam("生产类型") private String workOrderType; - @Column(name="PRODUCE_CATEGORY") - @ApiParam("产品类型") - private String produceCategory; + @Column(name="PRODUCE_CATEGORY_CODE") + @ApiParam("产品类型代码") + private String produceCategoryCode; + @Column(name="PRODUCE_CATEGORY_NAME_RDD") + @ApiParam("产品类型名称") + private String produceCategoryNameRdd; public double getSeqVal() { return this.seq == null ? 0.0d : this.seq; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index c3e984f..f2dd1e2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -4,6 +4,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Transient; import java.io.Serializable; import java.util.List; @@ -17,30 +18,43 @@ import java.util.List; @Data @Api("JIT队列列表Model") public class QueueOrderModel implements Serializable { - @ApiParam("队列ID") - public Long queueId; - @ApiParam("队列明细ID") - public Long queueDetailId; @ApiParam("队列序号") - public Integer queueSeq; + public Double queueSeq; @ApiParam("队列明细序号") - public Integer queDetailSeq; + public Double queDetailSeq; @ApiParam("客户标识号") public String custFlagNo; @ApiParam("产品配置名称") - public String prodCfgName; + public String prodCfgNameRdd; @ApiParam("产品类型名称") - public String categoryName; + public String categoryNameRdd; @ApiParam("产品条码") public String serialNumber; @ApiParam("物料号") public String partNo; - @ApiParam("物料ID") - public Long partId; + @ApiParam("物料名称") + public String partNameRdd; @ApiParam("条码状态") public Integer snStatus; @ApiParam("生产类型") public String workType; + @Transient + @ApiParam("显示颜色") + private String color; + public QueueOrderModel() { + } - + public QueueOrderModel(Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) { + this.queueSeq = queueSeq; + this.queDetailSeq = queDetailSeq; + this.custFlagNo = custFlagNo; + this.prodCfgNameRdd = prodCfgNameRdd; + this.categoryNameRdd = categoryNameRdd; + this.serialNumber = serialNumber; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.snStatus = snStatus; + this.workType = workType; + } }