From 47904278c5fa30e2995a1af83d1b6acdfa9db714 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: Mon, 8 Jun 2020 15:46:42 +0800
Subject: [PATCH] =?UTF-8?q?2092=20MES202006-=E9=A6=96=E6=A3=80=E3=80=81?=
 =?UTF-8?q?=E5=B7=A1=E6=A3=80=E6=A3=80=E9=AA=8C=E5=8D=95=E6=8D=AE=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E9=80=BB=E8=BE=91=E5=8F=98=E6=9B=B4-20200615?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java        | 4 ++++
 .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java   | 4 ++++
 .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java       | 4 ++++
 .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java | 2 +-
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java
index 8e58dec..74de05a 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java
@@ -98,4 +98,8 @@ public class IfQcOrder extends BaseBean  implements Serializable {
     @ApiParam("检测类型")
     private Integer checkType;
 
+    @Column(name = "CUST_DELIERY_LOCATION")
+    @ApiParam("客户发运地")
+    private String custDelieryLocation;
+
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java
index 3f0402c..b9c75bf 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java
@@ -88,6 +88,10 @@ public class MesQcCheckStandard extends BaseBean implements Serializable {
     @ApiParam("是否允许让步")
     private Integer isConcession = 0;
 
+    @Column(name = "NUMBER_FLAG")
+    @ApiParam("数量标识")
+    private String numberFlag;
+
     @Transient
     @ApiParam("检测类型名称")
     private String checkTypeName;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java
index 5dd373d..9e98310 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java
@@ -100,6 +100,10 @@ public class MesQcOrder extends BaseBean  implements Serializable {
     @ApiParam("发运时间")
     private String deliveryDate;
 
+    @Column(name = "CUST_DELIERY_LOCATION")
+    @ApiParam("客户发运地")
+    private String custDelieryLocation;
+
     @ApiParam(value = "检测结果")
     @Transient
     private String reulstStatus;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java
index 3f192ac..60fae90 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java
@@ -82,7 +82,7 @@ public class MesQcOrderDetail extends BaseBean  implements Serializable {
 
     @ApiParam(value = "已完成数量")
     @Transient
-    private Integer finishQty;
+    private Integer finishQty = 0;
 
     @ApiParam(value = "检测项类型名称")
     @Transient