From 045dc01479509e76b0ce8ee0a8156c6f752427a4 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 23 Mar 2020 23:24:50 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1479=20=E6=96=99?= =?UTF-8?q?=E6=9E=B6=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 2 +- .../cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java | 4 + .../estsh/i3plus/pojo/mes/bean/MesProductData.java | 3 +- .../i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 6 +- .../estsh/i3plus/pojo/mes/model/EsProductData.java | 87 ++++++++++++++++++++++ .../pojo/mes/model/QueueJitActualModule.java | 37 +++++++++ .../i3plus/pojo/mes/model/QueueOrderModel.java | 18 +++++ .../i3plus/pojo/mes/model/StepPrintSnModel.java | 20 +++++ 8 files changed, 173 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductData.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModule.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index 6c6aeec..6a49f5e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -127,5 +127,5 @@ public class MesPlc extends BaseBean implements Serializable { @Transient @ApiParam("OPC值") - private List opcValue; + private String opcValue; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java index 34389f0..6a40ee7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java @@ -42,4 +42,8 @@ public class MesProdCfg extends BaseBean implements Serializable { @Column(name = "PROD_CFG_Type_CODE") @ApiParam("产品配置类型代码") private String prodCfgTypeCode; + + @Column(name = "PROD_CFG_TYPE") + @ApiParam("产品配置类型") + private String prodCfgType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java index 8590fbb..cd951ae 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java @@ -13,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; import java.io.Serializable; -import java.util.List; /** * @Description :生产数据 @@ -113,7 +112,7 @@ public class MesProductData extends BaseBean implements Serializable { @Lob @Column(name = "LINE_DATA") @ApiParam("生产数据") - private List lineData; + private String lineData; @Lob @Transient 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 04517c5..5d43571 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 @@ -76,7 +76,7 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("产品类型名称") private String pptCode; - @Column(name = "QUEUE_GROUP_NO") + @Column(name = "QUEUE_GROUP_NO") @ApiParam("分组队列编号") private String queueGroupNo; @@ -84,6 +84,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("组内编号") private Integer groupNo; + @Column(name = "IS_GROUP_PRINTED") + @ApiParam("料架是否已打印") + private Integer isGroupPrinted; + @Transient @ApiParam("队列序号") private Double queueSeq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductData.java new file mode 100644 index 0000000..eaba2fa --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductData.java @@ -0,0 +1,87 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.mes.annotation.ElasticSearch; +import cn.estsh.i3plus.pojo.mes.annotation.Json4Es; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/3/20 5:51 下午 + * @Modify: + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@ElasticSearch +public class EsProductData extends BaseBean implements Serializable { + + private static final long serialVersionUID = 4514407617515827040L; + + @ApiParam("工作中心") + private String workCenterCode; + + @ApiParam("工作中心名称") + private String workCenterName; + + @ApiParam("工作单元") + private String workCellCode; + + @ApiParam("工作单元名称") + private String workCellName; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("产品条码") + private String productSn; + + @ApiParam("工单号") + private String orderNo; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partDesc; + + @ApiParam("设备代码") + private String equCode; + + @ApiParam("设备名称") + private String equName; + + @ApiParam("对象代码") + private String objectCode; + + @ApiParam("对象名称") + private String objectName; + + @ApiParam("字段代码") + private String fieldCode; + + @ApiParam("字段名称") + private String fieldName; + + @ApiParam("字段值") + private String fieldValue; + + @ApiParam("数据行号") + private String rowNo; + + @ApiParam("数据组号") + private String groupNo; + + @Json4Es + @ApiParam("生产数据") + private String lineData; + + @ApiParam("字段总数") + private Integer fieldNum; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModule.java new file mode 100644 index 0000000..5ae7b20 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModule.java @@ -0,0 +1,37 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/3/20 9:02 下午 + * @Modify: + */ +@Data +public class QueueJitActualModule { + + private Long id; + @ApiParam("vin") + private String vinCode; + @ApiParam("排序号") + private Double seq; + @ApiParam("分组队列编号") + private String queueGroupNo; + @ApiParam("组内编号") + private Integer groupNo; + + public QueueJitActualModule() { + + } + + public QueueJitActualModule(Long id, String vinCode, Double seq, String queueGroupNo, Integer groupNo) { + this.id = id; + this.vinCode = vinCode; + this.seq = seq; + this.queueGroupNo = queueGroupNo; + this.groupNo = groupNo; + } + +} 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 9acf8a7..fc9173f 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 @@ -50,6 +50,15 @@ public class QueueOrderModel implements Serializable { @ApiParam("工位") private String workCellCode; + @ApiParam("生产组代码") + private String pgCode; + @ApiParam("分组队列编号") + private String queueGroupNo; + @ApiParam("组内编号") + private Integer groupNo; + @ApiParam("产品配置代码") + private String prodCfgCode; + public QueueOrderModel() { } @@ -81,4 +90,13 @@ public class QueueOrderModel implements Serializable { this.snStatus = snStatus; this.workType = workType; } + + public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode) { + this.id = id; + this.queDetailSeq = queDetailSeq; + this.pgCode = pgCode; + this.queueGroupNo = queueGroupNo; + this.groupNo = groupNo; + this.prodCfgCode = prodCfgCode; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java index 2004603..91cd118 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java @@ -72,4 +72,24 @@ public class StepPrintSnModel extends MesProduceSn { @ApiParam("包装层级 1-第一层，2-第二层，3-第三层，4-第四层") private Integer packLevel; + @ApiParam("生产组代码") + private String pgCode; + @ApiParam("分组队列编号") + private String queueGroupNo; + @ApiParam("组内编号") + private Integer groupNo; + @ApiParam("产品配置代码") + private String prodCfgCode; + @ApiParam("队列生产明细序号") + private Double queDetailSeq; + + @ApiParam("vin") + private String vinCode; + @ApiParam("客户JIT生产队列排序号") + private Double seq; + @ApiParam("jit车号") + private String jitCarNo; + @ApiParam("车型代码") + private String carModuleCode; + }