From 52b2ea43da808f3d1976d2bd76e3022dd7b89909 Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Thu, 1 Apr 2021 19:34:16 +0800
Subject: [PATCH] =?UTF-8?q?14859=2019081-JISA=E6=94=B6=E5=BA=8F=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E8=B6=85=E6=97=B6=E5=92=8C=E9=98=9F=E5=88=97=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E9=A2=84=E8=AD=A6=E4=BF=A1=E6=81=AF-=E9=82=AE?=
 =?UTF-8?q?=E4=BB=B6=E6=8F=90=E7=A4=BA=E5=86=85=E5=AE=B9=E5=8A=A0=E4=B8=8A?=
 =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java    |  8 ++++++++
 .../java/cn/estsh/i3plus/pojo/mes/bean/MesKpDataRecord.java   | 11 ++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java
index a84f553..8e3bbf9 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java
@@ -117,6 +117,14 @@ public class MesKpData extends BaseBean implements Serializable {
     @ApiParam("特殊码")
     private String specificSn;
 
+    @Transient
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @Transient
+    @ApiParam("采集结果")
+    private Integer result;
+
 
     public double getKeyDataCountVal() {
         return this.keyDataCount == null ? 0 : this.keyDataCount;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpDataRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpDataRecord.java
index 9e8a774..4188057 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpDataRecord.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpDataRecord.java
@@ -98,7 +98,16 @@ public class MesKpDataRecord extends BaseBean implements Serializable {
 
     @Column(name = "ACTUAL_NUM")
     @ApiParam("实采个数")
-    private Integer actualNum;;
+    private Integer actualNum;
+
+    @Column(name = "SPECIFIC_SN")
+    @ApiParam("特殊码")
+    private String specificSn;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("过程条码")
+    private String serialNumber;
+
 
     public double getKeyDataCountVal() {
         return this.keyDataCount == null ? 0 : this.keyDataCount;