From ae9978a3bb3088d234cc25751255b07d35ac1937 Mon Sep 17 00:00:00 2001
From: Dominic_Xiao <1003069915@qq.com>
Date: Mon, 7 Dec 2020 19:24:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9EserialNumber=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/mes/model/QcOrderCheckDataDetailModel.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcOrderCheckDataDetailModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcOrderCheckDataDetailModel.java
index 170de7d..f470ffb 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcOrderCheckDataDetailModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcOrderCheckDataDetailModel.java
@@ -30,10 +30,12 @@ public class QcOrderCheckDataDetailModel {
 
     private Integer checkResult;
 
+    private String serialNumber;
+
 
     public QcOrderCheckDataDetailModel(Integer checkType, String checkItem, String checkStandard, Integer checkCount,
                                        Integer isConcession, Integer isKeyCheckItem, Double max, Double min,
-                                       String checkValue, Integer checkResult) {
+                                       String checkValue, Integer checkResult, String serialNumber) {
         this.checkType = checkType;
         this.checkItem = checkItem;
         this.checkStandard = checkStandard;
@@ -44,5 +46,6 @@ public class QcOrderCheckDataDetailModel {
         this.min = min;
         this.checkValue = checkValue;
         this.checkResult = checkResult;
+        this.serialNumber = serialNumber;
     }
 }

From 4cfee2dc9cf8e0f9047aea6f5b8f1294d7d9a9f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= <jessica.chen@estsh.com>
Date: Tue, 8 Dec 2020 14:53:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=9012591=2020027-BI-=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E7=BB=8F=E7=90=86BI=E6=8A=A5=E8=A1=A8-=E8=B0=83?=
 =?UTF-8?q?=E8=A7=92=E5=99=A8=E5=B7=A5=E5=8E=82=E7=94=9F=E4=BA=A7=E7=BA=BF?=
 =?UTF-8?q?=E4=BA=A7=E5=87=BA=E6=83=85=E5=86=B5-=E6=B5=AE=E7=AA=97?=
 =?UTF-8?q?=E8=A7=A3=E9=87=8A=E4=B8=8D=E6=B8=85=E6=99=B0-2020-12-04?=
 =?UTF-8?q?=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
index 4308bde..5ac72a7 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
@@ -424,6 +424,10 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam("模具编号集合")
     private String mouldCodeList;
 
+    @Transient
+    @ApiParam("不良数量")
+    private Integer ngQty;
+