From 00df3134b20e8fa2442bfabdb5d309a206f4ebaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= <adair.song@estsh.com>
Date: Wed, 13 May 2020 11:11:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=9A=E3=80=901829?=
 =?UTF-8?q?=E3=80=91-=E6=9B=B4=E6=96=B0=E6=A3=80=E6=B5=8B=E5=8D=95?=
 =?UTF-8?q?=E5=92=8C=E6=A3=80=E6=B5=8B=E5=8D=95=E6=98=8E=E7=BB=86=E5=AE=9E?=
 =?UTF-8?q?=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java     | 11 +++++++----
 .../estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java  | 19 +++++++------------
 2 files changed, 14 insertions(+), 16 deletions(-)

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 dcc8eed..59f5e0f 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
@@ -12,7 +12,6 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
@@ -52,6 +51,10 @@ public class MesQcOrder extends BaseBean implements Serializable {
     @ApiParam("数量")
     private BigDecimal qty;
 
+    @Column(name = "FINISH_QTY")
+    @ApiParam("已检数量")
+    private BigDecimal finishQty;
+
     @Column(name = "UNIT")
     @ApiParam("单位")
     private String unit;
@@ -84,7 +87,7 @@ public class MesQcOrder extends BaseBean implements Serializable {
     @ApiParam("检测整体结果")
     private Integer checkResult;
 
-    @Transient
-    @ApiParam("供应商名称")
-    private String supplierName;
+    @Column(name = "MEMO")
+    @ApiParam("备注")
+    private String memo;
 }
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 599196a..3816286 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
@@ -12,7 +12,6 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -63,23 +62,19 @@ public class MesQcOrderDetail extends BaseBean implements Serializable {
     @ApiParam("是否允许让步")
     private String isConcession;
 
-    @Column(name = "STATUS")
-    @ApiParam("状态")
-    private Integer status;
-
     @Column(name = "CHECK_RESULT")
-    @ApiParam("检测整体结果")
+    @ApiParam("检测结果")
     private Integer checkResult;
 
     @Column(name = "CHECK_VALUE")
     @ApiParam("检测值")
     private String checkValue;
 
-    @Transient
-    @ApiParam("本批次生产总数")
-    private Integer currentLotNoSum;
+    @Column(name = "ITEM_NO")
+    @ApiParam("检验行号")
+    private Integer itemNo;
 
-    @Transient
-    @ApiParam("收货批次")
-    private String srcLotNo;
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
 }