From 895eb461aba98df24c36e1bda4426567bf8a9ec8 Mon Sep 17 00:00:00 2001
From: "jhforever.wang@estsh.com" <jhforever.wang@estsh.com>
Date: Sat, 19 Sep 2020 13:31:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=8D=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java  | 26 ++++++++++++++++++++++
 .../estsh/i3plus/pojo/mes/bean/MesPartCheck.java   |  8 +++++++
 .../i3plus/pojo/mes/model/DataReviewModel.java     |  9 ++++++++
 .../pojo/mes/model/ProductDataCacheModel.java      |  3 +++
 4 files changed, 46 insertions(+)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
index a4c6cd6..ebde426 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
@@ -13,6 +13,32 @@ import org.apache.commons.lang3.StringUtils;
 public class MesPcnEnumUtil {
 
     /**
+     * 物料校验项数据查询类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PART_CHECK_DATA_TYPE {
+        ALL_DATA(1, "所有数据"),
+        LAST_DATA(2, "最后一条数据");
+
+        private int value;
+        private String description;
+
+        PART_CHECK_DATA_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
      * 注塑生产操作模式
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java
index 8cbe1c3..90ec210 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java
@@ -53,6 +53,14 @@ public class MesPartCheck extends BaseBean implements Serializable {
     @ApiParam("记录数量表达式")
     private String recordNumSpelExpress;
 
+    @Column(name = "DATA_TYPE")
+    @ApiParam("数据查询类型")
+    private Integer dataType = 1;
+
+    @Column(name = "LIMIT_TIMES")
+    @ApiParam("限定检测次数")
+    private Integer limitTimes;
+
     @Column(name = "RECORD_NUM_DESC")
     @ApiParam("校验表达式描述")
     private String recordNumDesc;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java
index 843eb9c..77997e5 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java
@@ -22,6 +22,12 @@ public class DataReviewModel {
     @ApiParam("实际数量")
     private String realNum;
 
+    @ApiParam("限定次数")
+    private String limitTimes;
+
+    @ApiParam("检测次数")
+    private String checkTimes;
+
     @ApiParam("对象代码")
     private String objectCode;
 
@@ -31,6 +37,9 @@ public class DataReviewModel {
     @ApiParam("是否合格")
     private String reviewResult;
 
+    @ApiParam("显示标识")
+    private String showFlag;
+
     @ApiParam("关键件颜色")
     private String keyPartColor;
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java
index 16d5f94..ae6e97a 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java
@@ -21,4 +21,7 @@ public class ProductDataCacheModel {
     @ApiParam("字段名称")
     private List<ProductDataModel> productDataModelList;
 
+    @ApiParam("创建时间")
+    private String createDatetime;
+
 }